Fixing some variable names