change field names to match the ones that Ava came up with.   Finally ready to integrate  into CTRP