Further removal of JDO-specific properties, and try to use PropertyNames
wherever possible