diff --git a/src/DOMAPI.res b/src/DOMAPI.res
index 80fdb61..073a1a0 100644
--- a/src/DOMAPI.res
+++ b/src/DOMAPI.res
@@ -2433,7 +2433,7 @@ type rec node = {
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -2468,7 +2468,7 @@ type rec node = {
 NodeList objects are collections of nodes, usually returned by properties such as Node.childNodes and methods such as document.querySelectorAll().
 [See NodeList on MDN](https://developer.mozilla.org/docs/Web/API/NodeList)
 */
-@editor.completeFrom(NodeList) and nodeList = {
+@editor.completeFrom(NodeList) and nodeList<'tNode> = {
   /**
     Returns the number of nodes in the collection.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/NodeList/length)
@@ -2476,16 +2476,6 @@ NodeList objects are collections of nodes, usually returned by properties such a
   length: int,
 }
 
-and nodeListOf<'tNode> = {
-  // Base properties from NodeList
-  /**
-    Returns the number of nodes in the collection.
-    [Read more on MDN](https://developer.mozilla.org/docs/Web/API/NodeList/length)
-    */
-  length: int,
-  // End base properties from NodeList
-}
-
 /**
 Element is the most general base class from which all objects in a Document inherit. It only has methods and properties common to all kinds of elements. More specific classes inherit from Element.
 [See Element on MDN](https://developer.mozilla.org/docs/Web/API/Element)
@@ -2531,7 +2521,7 @@ Element is the most general base class from which all objects in a Document inhe
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -2663,7 +2653,7 @@ Element is the most general base class from which all objects in a Document inhe
     Returns the child elements.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/children)
     */
-  children: htmlCollection,
+  children: htmlCollection<element>,
   /**
     Returns the first child that is an element, and null otherwise.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/firstElementChild)
@@ -2905,7 +2895,7 @@ Element is the most general base class from which all objects in a Document inhe
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -3001,22 +2991,12 @@ Similarly, when the focused element is in a different node tree than documentOrS
 A generic collection (array-like object similar to arguments) of elements (in document order) and offers methods and properties for selecting from the list.
 [See HTMLCollection on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection)
 */
-@editor.completeFrom(HTMLCollection) and htmlCollection = {
-  /**
-    Sets or retrieves the number of objects in a collection.
-    [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection/length)
-    */
-  length: int,
-}
-
-and htmlCollectionOf<'t> = {
-  // Base properties from HTMLCollection
+@editor.completeFrom(HTMLCollection) and htmlCollection<'t> = {
   /**
     Sets or retrieves the number of objects in a collection.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection/length)
     */
   length: int,
-  // End base properties from HTMLCollection
 }
 
 /**
@@ -3178,7 +3158,7 @@ Any HTML element. Some elements directly implement this interface, while others
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -3551,7 +3531,7 @@ Contains the descriptive information, or metadata, for a document. This object i
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -3807,7 +3787,7 @@ A <form> element in the DOM; it allows access to and in some cases modification
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -4114,7 +4094,7 @@ Provides special properties and methods for manipulating <img> elements.
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -4457,7 +4437,7 @@ Provides special properties (beyond the regular HTMLElement interface it also ha
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -4729,7 +4709,7 @@ Hyperlink elements and provides special properties and methods (beyond those of
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -5102,7 +5082,7 @@ Provides special properties and methods (beyond those of the regular object HTML
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -5455,7 +5435,7 @@ HTML <script> elements expose the HTMLScriptElement interface, which provides sp
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -5584,7 +5564,7 @@ and documentType = {
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -5674,7 +5654,7 @@ Any web page loaded in the browser and serves as an entry point into the web pag
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -5808,32 +5788,32 @@ If the contents are sandboxed into a unique origin (e.g. in an iframe with the s
     Retrieves a collection, in source order, of img objects in the document.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/images)
     */
-  images: htmlCollectionOf<htmlImageElement>,
+  images: htmlCollection<htmlImageElement>,
   /**
     Retrieves a collection of all embed objects in the document.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/embeds)
     */
-  embeds: htmlCollectionOf<htmlEmbedElement>,
+  embeds: htmlCollection<htmlEmbedElement>,
   /**
     Return an HTMLCollection of the embed elements in the Document.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/plugins)
     */
-  plugins: htmlCollectionOf<htmlEmbedElement>,
+  plugins: htmlCollection<htmlEmbedElement>,
   /**
     Retrieves a collection of all a objects that specify the href property and all area objects in the document.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/links)
     */
-  links: htmlCollectionOf<any>,
+  links: htmlCollection<element>,
   /**
     Retrieves a collection, in source order, of all form objects in the document.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/forms)
     */
-  forms: htmlCollectionOf<htmlFormElement>,
+  forms: htmlCollection<htmlFormElement>,
   /**
     Retrieves a collection of all script objects in the document.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/scripts)
     */
-  scripts: htmlCollectionOf<htmlScriptElement>,
+  scripts: htmlCollection<htmlScriptElement>,
   /**
     Returns the script element, or the SVG script element, that is currently executing, as long as the element represents a classic script. In the case of reentrant script execution, returns the one that most recently started executing amongst those that have not yet finished executing.
 
@@ -5910,7 +5890,7 @@ Similarly, when the focused element is in a different node tree than documentOrS
     Returns the child elements.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/children)
     */
-  children: htmlCollection,
+  children: htmlCollection<element>,
   /**
     Returns the first child that is an element, and null otherwise.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/firstElementChild)
@@ -6142,12 +6122,12 @@ and mutationRecord = {
     Return the nodes added and removed respectively.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/MutationRecord/addedNodes)
     */
-  addedNodes: nodeList,
+  addedNodes: nodeList<node>,
   /**
     Return the nodes added and removed respectively.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/MutationRecord/removedNodes)
     */
-  removedNodes: nodeList,
+  removedNodes: nodeList<node>,
   /**
     Return the previous and next sibling respectively of the added or removed nodes, and null otherwise.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/MutationRecord/previousSibling)
@@ -6220,7 +6200,7 @@ and attr = {
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -6322,7 +6302,7 @@ The CharacterData abstract interface represents a Node object that contains char
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -6418,7 +6398,7 @@ A minimal document object that has no parent. It is used as a lightweight versio
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -6453,7 +6433,7 @@ A minimal document object that has no parent. It is used as a lightweight versio
     Returns the child elements.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/children)
     */
-  children: htmlCollection,
+  children: htmlCollection<element>,
   /**
     Returns the first child that is an element, and null otherwise.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/firstElementChild)
@@ -6693,7 +6673,7 @@ A minimal document object that has no parent. It is used as a lightweight versio
     Returns the children.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/childNodes)
     */
-  childNodes: nodeListOf<node>,
+  childNodes: nodeList<node>,
   /**
     Returns the first child.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Node/firstChild)
@@ -6869,7 +6849,7 @@ type elementInternals = {
     Returns a NodeList of all the label elements that internals's target element is associated with.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/ElementInternals/labels)
     */
-  labels: nodeList,
+  labels: nodeList<any>,
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/ElementInternals/states)
     */
@@ -7383,12 +7363,12 @@ type rec htmlTableElement = {
     Retrieves a collection of all tBody objects in the table. Objects in this collection are in source order.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLTableElement/tBodies)
     */
-  tBodies: htmlCollectionOf<htmlTableSectionElement>,
+  tBodies: htmlCollection<htmlTableSectionElement>,
   /**
     Sets or retrieves the number of horizontal rows contained in the object.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLTableElement/rows)
     */
-  rows: htmlCollectionOf<htmlTableRowElement>,
+  rows: htmlCollection<htmlTableRowElement>,
 }
 
 /**
@@ -7409,7 +7389,7 @@ Provides special properties and methods (beyond the HTMLElement interface it als
     Sets or retrieves the number of horizontal rows contained in the object.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLTableSectionElement/rows)
     */
-  rows: htmlCollectionOf<htmlTableRowElement>,
+  rows: htmlCollection<htmlTableRowElement>,
 }
 
 /**
@@ -7470,7 +7450,7 @@ Provides special properties and methods (beyond the HTMLElement interface it als
     Retrieves a collection of all cells in the table row.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLTableRowElement/cells)
     */
-  cells: htmlCollectionOf<htmlTableCellElement>,
+  cells: htmlCollection<htmlTableCellElement>,
 }
 
 /**
@@ -7538,7 +7518,7 @@ type rec htmlButtonElement = {
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLButtonElement/labels)
     */
-  labels: nodeListOf<htmlLabelElement>,
+  labels: nodeList<htmlLabelElement>,
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLButtonElement/popoverTargetElement)
     */
@@ -7673,7 +7653,7 @@ Provides special properties and methods for manipulating the layout and presenta
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLTextAreaElement/labels)
     */
-  labels: nodeListOf<htmlLabelElement>,
+  labels: nodeList<htmlLabelElement>,
   /**
     Gets or sets the starting position or offset of a text selection.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLTextAreaElement/selectionStart)
@@ -7740,7 +7720,7 @@ Can be set, to change the value.
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLOutputElement/labels)
     */
-  labels: nodeListOf<htmlLabelElement>,
+  labels: nodeList<htmlLabelElement>,
 }
 
 /**
@@ -7929,7 +7909,7 @@ Provides special properties and methods for manipulating the options, layout, an
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLInputElement/labels)
     */
-  labels: Null.t<nodeListOf<htmlLabelElement>>,
+  labels: Null.t<nodeList<htmlLabelElement>>,
   /**
     Gets or sets the starting position or offset of a text selection.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLInputElement/selectionStart)
@@ -7976,7 +7956,7 @@ Provides special properties (beyond the HTMLElement object interface it also has
     Returns an HTMLCollection of the option elements of the datalist element.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLDataListElement/options)
     */
-  options: htmlCollectionOf<htmlOptionElement>,
+  options: htmlCollection<htmlOptionElement>,
 }
 
 /**
@@ -8033,7 +8013,7 @@ A <select> HTML Element. These elements also share all of the properties and met
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLSelectElement/selectedOptions)
     */
-  selectedOptions: htmlCollectionOf<htmlOptionElement>,
+  selectedOptions: htmlCollection<htmlOptionElement>,
   /**
     Sets or retrieves the index of the selected option in a select object.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLSelectElement/selectedIndex)
@@ -8062,7 +8042,7 @@ A <select> HTML Element. These elements also share all of the properties and met
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLSelectElement/labels)
     */
-  labels: nodeListOf<htmlLabelElement>,
+  labels: nodeList<htmlLabelElement>,
 }
 
 /**
@@ -8117,7 +8097,7 @@ HTMLOptionsCollection is an interface representing a collection of HTML option e
 [See HTMLOptionsCollection on MDN](https://developer.mozilla.org/docs/Web/API/HTMLOptionsCollection)
 */
 @editor.completeFrom(HTMLOptionsCollection) and htmlOptionsCollection = {
-  ...htmlCollectionOf<htmlOptionElement>,
+  ...htmlCollection<htmlOptionElement>,
   /**
     Returns the index of the first selected item, if any, or −1 if there is no selected item.
 
@@ -8411,7 +8391,7 @@ type htmlFieldSetElement = {
     Returns an HTMLCollection of the form controls in the element.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLFieldSetElement/elements)
     */
-  elements: htmlCollection,
+  elements: htmlCollection<element>,
   /**
     Returns whether an element will successfully validate based on forms validation rules and constraints.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLFieldSetElement/willValidate)
@@ -8636,7 +8616,7 @@ type htmlMapElement = {
     Retrieves a collection of the area objects defined for the given map object.
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLMapElement/areas)
     */
-  areas: htmlCollection,
+  areas: htmlCollection<element>,
 }
 
 /**
@@ -8709,7 +8689,7 @@ type htmlMeterElement = {
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLMeterElement/labels)
     */
-  labels: nodeListOf<htmlLabelElement>,
+  labels: nodeList<htmlLabelElement>,
 }
 
 /**
@@ -8878,7 +8858,7 @@ type htmlProgressElement = {
   /**
     [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLProgressElement/labels)
     */
-  labels: nodeListOf<htmlLabelElement>,
+  labels: nodeList<htmlLabelElement>,
 }
 
 /**
diff --git a/src/DOMAPI/Document.res b/src/DOMAPI/Document.res
index 1a496db..1dbff8c 100644
--- a/src/DOMAPI/Document.res
+++ b/src/DOMAPI/Document.res
@@ -89,7 +89,7 @@ Returns all element descendants of node that match selectors.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/querySelectorAll)
 */
 @send
-external querySelectorAll: (document, string) => nodeList = "querySelectorAll"
+external querySelectorAll: (document, string) => nodeList<element> = "querySelectorAll"
 
 /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/createExpression)
@@ -120,7 +120,8 @@ Retrieves a collection of objects based on the specified element name.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/getElementsByTagName)
 */
 @send
-external getElementsByTagName: (document, string) => htmlCollection = "getElementsByTagName"
+external getElementsByTagName: (document, string) => htmlCollection<element> =
+  "getElementsByTagName"
 
 /**
 If namespace and localName are "*" returns a HTMLCollection of all descendant elements.
@@ -137,14 +138,14 @@ external getElementsByTagNameNS: (
   document,
   ~namespace: string,
   ~localName: string,
-) => htmlCollectionOf<element> = "getElementsByTagNameNS"
+) => htmlCollection<element> = "getElementsByTagNameNS"
 
 /**
 Returns a HTMLCollection of the elements in the object on which the method was invoked (a document or an element) that have all the classes given by classNames. The classNames argument is interpreted as a space-separated list of classes.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/getElementsByClassName)
 */
 @send
-external getElementsByClassName: (document, string) => htmlCollectionOf<element> =
+external getElementsByClassName: (document, string) => htmlCollection<element> =
   "getElementsByClassName"
 
 /**
@@ -371,7 +372,7 @@ Gets a collection of objects based on the value of the NAME or ID attribute.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/getElementsByName)
 */
 @send
-external getElementsByName: (document, string) => nodeListOf<htmlElement> = "getElementsByName"
+external getElementsByName: (document, string) => nodeList<htmlElement> = "getElementsByName"
 
 /**
 Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method.
diff --git a/src/DOMAPI/DocumentFragment.res b/src/DOMAPI/DocumentFragment.res
index 203903f..cf15104 100644
--- a/src/DOMAPI/DocumentFragment.res
+++ b/src/DOMAPI/DocumentFragment.res
@@ -70,7 +70,7 @@ Returns all element descendants of node that match selectors.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/DocumentFragment/querySelectorAll)
 */
   @send
-  external querySelectorAll: (T.t, string) => nodeList = "querySelectorAll"
+  external querySelectorAll: (T.t, string) => nodeList<element> = "querySelectorAll"
 
   /**
 Replace all children of node with nodes, while replacing strings in nodes with equivalent Text nodes.
diff --git a/src/DOMAPI/Element.res b/src/DOMAPI/Element.res
index 0cf6b7e..179e613 100644
--- a/src/DOMAPI/Element.res
+++ b/src/DOMAPI/Element.res
@@ -162,14 +162,14 @@ Returns a HTMLCollection of the elements in the object on which the method was i
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Element/getElementsByClassName)
 */
   @send
-  external getElementsByClassName: (T.t, string) => htmlCollectionOf<element> =
+  external getElementsByClassName: (T.t, string) => htmlCollection<element> =
     "getElementsByClassName"
 
   /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Element/getElementsByTagName)
 */
   @send
-  external getElementsByTagName: (T.t, string) => htmlCollection = "getElementsByTagName"
+  external getElementsByTagName: (T.t, string) => htmlCollection<element> = "getElementsByTagName"
 
   /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Element/getElementsByTagNameNS)
@@ -179,7 +179,7 @@ Returns a HTMLCollection of the elements in the object on which the method was i
     element,
     ~namespace: string,
     ~localName: string,
-  ) => htmlCollectionOf<element> = "getElementsByTagNameNS"
+  ) => htmlCollection<element> = "getElementsByTagNameNS"
 
   /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Element/getHTML)
@@ -272,7 +272,7 @@ Returns all element descendants of node that match selectors.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Document/querySelectorAll)
 */
   @send
-  external querySelectorAll: (T.t, string) => nodeList = "querySelectorAll"
+  external querySelectorAll: (T.t, string) => nodeList<element> = "querySelectorAll"
 
   /**
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/Element/releasePointerCapture)
diff --git a/src/DOMAPI/HTMLCollection.res b/src/DOMAPI/HTMLCollection.res
index dd06a84..02d07cf 100644
--- a/src/DOMAPI/HTMLCollection.res
+++ b/src/DOMAPI/HTMLCollection.res
@@ -5,11 +5,11 @@ Retrieves an object from various collections.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection/item)
 */
 @send
-external item: (htmlCollection, int) => element = "item"
+external item: (htmlCollection<'t>, int) => 't = "item"
 
 /**
 Retrieves a select object or an object from an options collection.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection/namedItem)
 */
 @send
-external namedItem: (htmlCollection, string) => element = "namedItem"
+external namedItem: (htmlCollection<'t>, string) => 't = "namedItem"
diff --git a/src/DOMAPI/HTMLCollectionOf.res b/src/DOMAPI/HTMLCollectionOf.res
deleted file mode 100644
index dcd63fb..0000000
--- a/src/DOMAPI/HTMLCollectionOf.res
+++ /dev/null
@@ -1,16 +0,0 @@
-open DOMAPI
-
-external asHTMLCollection: htmlCollectionOf<'t> => htmlCollection = "%identity"
-/**
-Retrieves an object from various collections.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection/item)
-*/
-@send
-external item: (htmlCollectionOf<'t>, int) => element = "item"
-
-/**
-Retrieves a select object or an object from an options collection.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection/namedItem)
-*/
-@send
-external namedItem: (htmlCollectionOf<'t>, string) => element = "namedItem"
diff --git a/src/DOMAPI/HTMLFormControlsCollection.res b/src/DOMAPI/HTMLFormControlsCollection.res
index 3ab3934..2a5540b 100644
--- a/src/DOMAPI/HTMLFormControlsCollection.res
+++ b/src/DOMAPI/HTMLFormControlsCollection.res
@@ -1,6 +1,6 @@
 open DOMAPI
 
-external asHTMLCollection: htmlFormControlsCollection => htmlCollection = "%identity"
+external asHTMLCollection: htmlFormControlsCollection => htmlCollection<element> = "%identity"
 /**
 Retrieves an object from various collections.
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/HTMLCollection/item)
diff --git a/src/DOMAPI/NodeList.res b/src/DOMAPI/NodeList.res
index e5f903a..526b429 100644
--- a/src/DOMAPI/NodeList.res
+++ b/src/DOMAPI/NodeList.res
@@ -5,4 +5,4 @@ Returns the node with index index from the collection. The nodes are sorted in t
 [Read more on MDN](https://developer.mozilla.org/docs/Web/API/NodeList/item)
 */
 @send
-external item: (nodeList, int) => node = "item"
+external item: (nodeList<'tNode>, int) => 'tNode = "item"
diff --git a/src/DOMAPI/NodeListOf.js b/src/DOMAPI/NodeListOf.js
deleted file mode 100644
index d856702..0000000
--- a/src/DOMAPI/NodeListOf.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/src/DOMAPI/NodeListOf.res b/src/DOMAPI/NodeListOf.res
deleted file mode 100644
index 14b0085..0000000
--- a/src/DOMAPI/NodeListOf.res
+++ /dev/null
@@ -1,9 +0,0 @@
-open DOMAPI
-
-external asNodeList: nodeListOf<'tNode> => nodeList = "%identity"
-/**
-Returns the node with index index from the collection. The nodes are sorted in tree order.
-[Read more on MDN](https://developer.mozilla.org/docs/Web/API/NodeList/item)
-*/
-@send
-external item: (nodeListOf<'tNode>, int) => node = "item"