diff --git a/hyper-schema.json b/hyper-schema.json
index 82cf32fa..5112eb09 100644
--- a/hyper-schema.json
+++ b/hyper-schema.json
@@ -43,16 +43,18 @@
         "properties": {
             "additionalProperties": { "$ref": "#" }
         },
-        "if": {"$ref": "#"},
-        "then": {"$ref": "#"},
-        "else": {"$ref": "#"},
+        "if": { "$ref": "#" },
+        "then": { "$ref": "#" },
+        "else": { "$ref": "#" },
         "allOf": { "$ref": "#/$defs/schemaArray" },
         "anyOf": { "$ref": "#/$defs/schemaArray" },
         "oneOf": { "$ref": "#/$defs/schemaArray" },
         "not": { "$ref": "#" },
         "contains": { "$ref": "#" },
-        "propertyNames": { "$ref": "#" },
-
+        "propertyNames": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" }
+        },
         "base": {
             "type": "string",
             "format": "uri-template"
diff --git a/schema.json b/schema.json
index 182eefb0..545dd093 100644
--- a/schema.json
+++ b/schema.json
@@ -140,7 +140,10 @@
                 ]
             }
         },
-        "propertyNames": { "$ref": "#" },
+        "propertyNames": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" }
+        },
         "const": true,
         "enum": {
             "type": "array",
@@ -162,9 +165,9 @@
         "format": { "type": "string" },
         "contentMediaType": { "type": "string" },
         "contentEncoding": { "type": "string" },
-        "if": {"$ref": "#"},
-        "then": {"$ref": "#"},
-        "else": {"$ref": "#"},
+        "if": { "$ref": "#" },
+        "then": { "$ref": "#" },
+        "else": { "$ref": "#" },
         "allOf": { "$ref": "#/$defs/schemaArray" },
         "anyOf": { "$ref": "#/$defs/schemaArray" },
         "oneOf": { "$ref": "#/$defs/schemaArray" },