Rework variable naming section