Comments variables renamed