Variable name fixes