Fix the naming of the var's to match the actual naming.