Variable name clean up in specs.