Fixing mis-named variables