Rename variables
Bug fix
Bug fix