Variable name cleanup