Rename fields to match LMS