Fixing variable naming