Variable name restructuring