fixing property name mapping