diff --git a/common/base.yaml b/common/base.yaml
index 1e8cbc0..620ef07 100644
--- a/common/base.yaml
+++ b/common/base.yaml
@@ -1,4 +1,4 @@
-# hdmf-schema-language=2.0.2
+# hdmf-schema-language=3.0.0
 datasets:
 - data_type_def: Data
   doc: An abstract data type for a dataset.
diff --git a/common/experimental.yaml b/common/experimental.yaml
index 0cb6ba4..9ca12b7 100644
--- a/common/experimental.yaml
+++ b/common/experimental.yaml
@@ -1,3 +1,4 @@
+# hdmf-schema-language=3.0.0
 groups: []
 datasets:
 - data_type_def: EnumData
diff --git a/common/namespace.yaml b/common/namespace.yaml
index b174003..e5d494a 100644
--- a/common/namespace.yaml
+++ b/common/namespace.yaml
@@ -1,4 +1,4 @@
-# hdmf-schema-language=2.0.2
+# hdmf-schema-language=3.0.0
 namespaces:
 - name: hdmf-common
   doc: Common data structures provided by HDMF
diff --git a/common/resources.yaml b/common/resources.yaml
index 5e091c7..543264c 100644
--- a/common/resources.yaml
+++ b/common/resources.yaml
@@ -1,4 +1,4 @@
-# hdmf-schema-language=2.0.2
+# hdmf-schema-language=3.0.0
 groups:
 - data_type_def: HERD
   data_type_inc: Container
diff --git a/common/sparse.yaml b/common/sparse.yaml
index 09de817..7672f05 100644
--- a/common/sparse.yaml
+++ b/common/sparse.yaml
@@ -1,4 +1,4 @@
-# hdmf-schema-language=2.0.2
+# hdmf-schema-language=3.0.0
 groups:
 - data_type_def: CSRMatrix
   data_type_inc: Container
diff --git a/common/table.yaml b/common/table.yaml
index 2bacf8b..5d7a903 100644
--- a/common/table.yaml
+++ b/common/table.yaml
@@ -1,4 +1,4 @@
-# hdmf-schema-language=2.0.2
+# hdmf-schema-language=3.0.0
 datasets:
 
 - data_type_def: VectorData
diff --git a/hdmf-common.schema.json b/hdmf.schema.json
similarity index 95%
rename from hdmf-common.schema.json
rename to hdmf.schema.json
index fc0f381..0f9b85c 100644
--- a/hdmf-common.schema.json
+++ b/hdmf.schema.json
@@ -1,9 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "hdmf-common.schema.json",
-  "title": "Schema for the HDMF Common specification",
-  "description": "A schema for validating HDMF Common YAML Files",
-  "version": "1.8.0",
+  "$id": "hdmf.schema.json",
+  "title": "Schema for the HDMF language specification",
+  "description": "A schema for validating HDMF YAML files and HDMF extensions",
+  "version": "3.0.0-beta",
   "type": "object",
   "additionalProperties": false,
   "properties": {
@@ -98,10 +98,10 @@
             "int16",
             "int8",
             "uint",
+            "uint64",
             "uint32",
             "uint16",
             "uint8",
-            "uint64",
             "numeric",
             "text",
             "utf",
@@ -141,6 +141,9 @@
         {
           "type": "array",
           "items": {"$ref": "#/definitions/shape_spec"}
+        },
+        {
+          "const": "scalar"
         }
       ]
     },
@@ -205,7 +208,6 @@
           "data_type_def": {"$ref":  "#/definitions/protectedString"},
           "data_type_inc": {"$ref":  "#/definitions/protectedString"},
           "quantity": {"$ref":  "#/definitions/quantity"},
-          "linkable": {"type": "boolean"},
           "datasets": {"$ref": "#/definitions/datasets"},
           "links": {"$ref": "#/definitions/links"},
           "groups": {"$ref": "#/definitions/groups"},
@@ -269,12 +271,10 @@
           "data_type_def": {"$ref":  "#/definitions/protectedString"},
           "data_type_inc": {"$ref":  "#/definitions/protectedString"},
           "quantity": {"$ref":  "#/definitions/quantity"},
-          "linkable": {"type": "boolean"},
           "attributes": {"$ref": "#/definitions/attributes"},
-          "value": {"description": "Optional constant, fixed value for the attribute."},
-          "default_value": {"description": "Optional default value for variable-valued attributes."}
+          "value": {"description": "Optional constant, fixed value for the dataset."}
         }
       }
     }
   }
-}
+}
\ No newline at end of file