Nishi, Vishal #645 Renaming to Data Transfer Objects, updating field types