BUGFIX: Rename variables that were shadowing something that is not kitten.