MLDS-02 grouping fields together on front end
MLDS-02 renaming backend to match front end