Rename variables for consistent code format