Formatting and correcting some variable names.