Field renaming to make them more CIM compliant