diff --git a/ocaml/idl/autogen/api-ref-autogen.md b/ocaml/idl/autogen/management-api.md
similarity index 76%
rename from ocaml/idl/autogen/api-ref-autogen.md
rename to ocaml/idl/autogen/management-api.md
index 1c64c0e8bfb..00d96267929 100644
--- a/ocaml/idl/autogen/api-ref-autogen.md
+++ b/ocaml/idl/autogen/management-api.md
@@ -5,4 +5,4 @@ Version **@xapi-version@**
 -  [Classes](@root@management-api/classes.html)
 -  [Relationships Between Classes](@root@management-api/relationships-between-classes.html)
 -  [Types](@root@management-api/types.html)
--  [ErrorHandling](@root@management-api/api-ref-autogen-errors.html)
+-  [ErrorHandling](@root@management-api/api-errors.html)
diff --git a/ocaml/idl/markdown_backend.ml b/ocaml/idl/markdown_backend.ml
index 38ec1c8caef..e039a7cfc42 100644
--- a/ocaml/idl/markdown_backend.ml
+++ b/ocaml/idl/markdown_backend.ml
@@ -525,7 +525,7 @@ let generate_errors () =
       ]
   in
   render_file
-    ("api_errors.mustache", "api-ref-autogen-errors.md")
+    ("api_errors.mustache", "api-errors.md")
     error_json templatesdir destdir
 
 let all api =
diff --git a/ocaml/idl/templates/api_errors.mustache b/ocaml/idl/templates/api_errors.mustache
index d2e877e25d1..384a737d9a2 100644
--- a/ocaml/idl/templates/api_errors.mustache
+++ b/ocaml/idl/templates/api_errors.mustache
@@ -1,7 +1,3 @@
----
- layout: doc
----
-
 # Error Handling
 
 When a low-level transport error occurs, or a request is malformed at the HTTP
diff --git a/ocaml/idl/templates/class.mustache b/ocaml/idl/templates/class.mustache
index 1112c851642..f61cdb0c7f1 100644
--- a/ocaml/idl/templates/class.mustache
+++ b/ocaml/idl/templates/class.mustache
@@ -1,7 +1,3 @@
----
- layout: doc
----
-
 # Class: {{{class_name}}}
 {{#class_deprecated}}
 
diff --git a/ocaml/idl/templates/classes.mustache b/ocaml/idl/templates/classes.mustache
index 3730d77d0bc..18f91f0ae3e 100644
--- a/ocaml/idl/templates/classes.mustache
+++ b/ocaml/idl/templates/classes.mustache
@@ -1,7 +1,3 @@
----
- layout: doc
----
-
 # Classes
 
 The following classes are defined:
diff --git a/ocaml/idl/templates/relationships.mustache b/ocaml/idl/templates/relationships.mustache
index 6678c875681..d6391561dfd 100644
--- a/ocaml/idl/templates/relationships.mustache
+++ b/ocaml/idl/templates/relationships.mustache
@@ -1,7 +1,3 @@
----
- layout: doc
----
-
 # Relationships Between Classes
 
 Fields that are bound together are shown in the following table:
diff --git a/ocaml/idl/templates/toc.mustache b/ocaml/idl/templates/toc.mustache
index 01f81f0982f..4b58953b6e7 100644
--- a/ocaml/idl/templates/toc.mustache
+++ b/ocaml/idl/templates/toc.mustache
@@ -1,15 +1,15 @@
 - title: API Reference
-  url: @root@api-ref-autogen.html
+  url: @root@management-api.html
   subfolderlist:
     - title: Classes
       url: @root@management-api/classes.html
-{{#classes}}
-    - title: Class:{{{name}}}
-      url: @root@management-api/class-{{{name_lower}}}.html
-{{/classes}}
     - title: Relationships Between Classes
       url: @root@management-api/relationships-between-classes.html
     - title: Types
       url: @root@management-api/types.html
+{{#classes}}
+    - title: Class:{{{name}}}
+      url: @root@management-api/class-{{{name_lower}}}.html
+{{/classes}}
     - title: Error Handling
-      url: @root@management-api/api-ref-autogen-errors.html
+      url: @root@management-api/api-errors.html
diff --git a/ocaml/idl/templates/types.mustache b/ocaml/idl/templates/types.mustache
index f1ebc136899..9e46c4b9044 100644
--- a/ocaml/idl/templates/types.mustache
+++ b/ocaml/idl/templates/types.mustache
@@ -1,7 +1,3 @@
----
- layout: doc
----
-
 # Types
 
 ## Primitives