PIM-1794: Renaming of methods/properties linked to associations