GPII-226: Transformed part of the model to use GPII common terms and required data structure when saving it to GPII server so it can be applied to OS.