Fix property names to new non-deprecated versions