Merge "[SF] Rename variables to match style" into rvc-dev