Completing conversion to using PropertyName instead of String in most parts of API