Fixed ambiguity between TenantObjectProperty definitions