diff --git a/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml b/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
index 05d04e0bc..b4eab413a 100644
--- a/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
+++ b/event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
@@ -4,15 +4,15 @@ properties:
   h:
     description: The height of the image in pixels.
     type: integer
+  w:
+    description: The width of the image in pixels.
+    type: integer
   mimetype:
     description: The mimetype of the image, e.g. ``image/jpeg``.
     type: string
   size:
     description: Size of the image in bytes.
     type: integer
-  w:
-    description: The width of the image in pixels.
-    type: integer
   thumbnail_url:
     description: The URL to a thumbnail of the image.
     type: string
@@ -20,6 +20,5 @@ properties:
     allOf:
       - $ref: thumbnail_info.yaml
     description: Metadata about the image referred to in ``thumbnail_url``.
-    title: ThumbnailInfo
-    type: object
 title: ImageInfo
+type: object
diff --git a/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml b/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
index 30ee4a240..5a233b241 100644
--- a/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
+++ b/event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
@@ -4,14 +4,14 @@ properties:
   h:
     description: The height of the image in pixels.
     type: integer
+  w:
+    description: The width of the image in pixels.
+    type: integer
   mimetype:
     description: The mimetype of the image, e.g. ``image/jpeg``.
     type: string
   size:
     description: Size of the image in bytes.
     type: integer
-  w:
-    description: The width of the image in pixels.
-    type: integer
 title: ThumbnailInfo
 type: object
diff --git a/event-schemas/schema/m.room.avatar b/event-schemas/schema/m.room.avatar
index 941076410..a0ecb21c2 100644
--- a/event-schemas/schema/m.room.avatar
+++ b/event-schemas/schema/m.room.avatar
@@ -9,8 +9,6 @@ properties:
         allOf:
           - $ref: core-event-schema/msgtype_infos/image_info.yaml
         description: Metadata about the image referred to in ``url``.
-        title: ImageInfo
-        type: object
       url:
         description: The URL to the image.
         type: string
diff --git a/event-schemas/schema/m.room.message#m.file b/event-schemas/schema/m.room.message#m.file
index 17cc577d6..76e59e09c 100644
--- a/event-schemas/schema/m.room.message#m.file
+++ b/event-schemas/schema/m.room.message#m.file
@@ -27,8 +27,6 @@ properties:
             allOf:
               - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
             description: Metadata about the image referred to in ``thumbnail_url``.
-            title: ThumbnailInfo
-            type: object
         title: FileInfo
         type: object
       msgtype:
diff --git a/event-schemas/schema/m.room.message#m.image b/event-schemas/schema/m.room.message#m.image
index 24857d94f..1237b8f80 100644
--- a/event-schemas/schema/m.room.message#m.image
+++ b/event-schemas/schema/m.room.message#m.image
@@ -12,8 +12,6 @@ properties:
         allOf:
           - $ref: core-event-schema/msgtype_infos/image_info.yaml
         description: Metadata about the image referred to in ``url``.
-        title: ImageInfo
-        type: object
       msgtype:
         enum:
           - m.image
diff --git a/event-schemas/schema/m.room.message#m.location b/event-schemas/schema/m.room.message#m.location
index 150c39248..e8d55769f 100644
--- a/event-schemas/schema/m.room.message#m.location
+++ b/event-schemas/schema/m.room.message#m.location
@@ -18,14 +18,13 @@ properties:
       info:
         type: object
         properties:
-          thumbnail_info:
-            allOf:
-              - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
-            title: ThumbnailInfo
-            type: object
           thumbnail_url:
             description: The URL to a thumbnail of the location being represented.
             type: string
+          thumbnail_info:
+            allOf:
+              - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
+            description:  Metadata about the image referred to in ``thumbnail_url``.
         title: LocationInfo
     required:
       - msgtype
diff --git a/event-schemas/schema/m.room.message#m.video b/event-schemas/schema/m.room.message#m.video
index 6f520ac2a..a0240b548 100644
--- a/event-schemas/schema/m.room.message#m.video
+++ b/event-schemas/schema/m.room.message#m.video
@@ -17,23 +17,22 @@ properties:
           h:
             description: The height of the video in pixels.
             type: integer
+          w:
+            description: The width of the video in pixels.
+            type: integer
           mimetype:
             description: The mimetype of the video e.g. ``video/mp4``.
             type: string
           size:
             description: The size of the video in bytes.
             type: integer
+          thumbnail_url:
+            description: The URL to an image thumbnail of the video clip.
+            type: string
           thumbnail_info:
             allOf:
               - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
-            title: ThumbnailInfo
-            type: object
-          thumbnail_url:
-            description: The URL to a thumbnail of the video clip.
-            type: string
-          w:
-            description: The width of the video in pixels.
-            type: integer
+            description: Metadata about the image referred to in ``thumbnail_url``.
         title: VideoInfo
         type: object
       msgtype: