Fixing variable names