lexicons/my/spoor/content/defs.json

@@ -1,15 +1,17 @@
 {
   "lexicon": 1,
-  "id": "my.spoor.content.title",
+  "id": "my.spoor.content.defs",
   "defs": {
-    "main": {
+    "title": {
       "type": "object",
       "properties": {
         "translationType": { 
           "type": "string",
           "format": "nsid",
           "knownValues": [
-            "#titleHomophonic", "#titleNative", "#titleTranslation"
+            "my.spoor.content.defs#titleHomophonic",
+            "my.spoor.content.defs#titleNative",
+            "my.spoor.content.defs#titleTranslation"
           ]
         },
         "lang": {

lexicons/my/spoor/content/external.json

@@ -14,7 +14,7 @@
             "minLength": 1,
             "items": {
               "type": "ref",
-              "ref": "my.spoor.content.title"
+              "ref": "my.spoor.content.defs#title"
             }
           },
           "source": {

lexicons/my/spoor/content/media.json

@@ -14,7 +14,7 @@
             "minLength": 1,
             "items": {
               "type": "ref",
-              "ref": "my.spoor.content.title"
+              "ref": "my.spoor.content.defs#title"
             }
           },
           "durationData": {

lexicons/my/spoor/log/activity.json

@@ -15,7 +15,7 @@
           "progress": {
             "type": "union",
             "refs": [
-              "#progressIndex"
+              "my.spoor.log.activity#indexProgress"
             ]
           },
           "performedAt": {
@@ -31,13 +31,9 @@
         }
       }
     },
-    "progressIndex": {
-      "type": "object",
-      "description": "The index of the content consumed. Content must be indexable",
-      "required": [ "index" ],
-      "properties": {
-        "index": { "type": "integer" }
-      }
+    "indexProgress": {
+      "type": "integer",
+      "description": "The index of the content consumed. Content must be indexable"
     }
   }
 }