Fixed some naming and formatting errors.