PHOENIX-1174 Rename and move properties using existing convention