Remove Mammoth prefix from util classes

56 files changed, 131 insertions, 131 deletions

diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
index ad95656..46ec83c 100644
--- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java
+++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
@@ -23,8 +23,8 @@ import java.util.function.Function;
 import java.util.zip.ZipFile;
 
 import static org.zwobble.mammoth.internal.docx.DocumentReader.readDocument;
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyMap;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class DocumentConverter {
     private final DocumentToHtmlOptions options;
diff --git a/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java
index 9835e29..27d9ccc 100644
--- a/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java
@@ -6,13 +6,13 @@ import org.zwobble.mammoth.internal.html.HtmlNode;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.styles.HtmlPath;
 import org.zwobble.mammoth.internal.styles.StyleMap;
-import org.zwobble.mammoth.internal.util.MammothLists;
+import org.zwobble.mammoth.internal.util.Lists;
 
 import java.io.IOException;
 import java.util.*;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.*;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.*;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
 
 public class DocumentToHtml {
@@ -164,7 +164,7 @@ public class DocumentToHtml {
             @Override
             public List<HtmlNode> visit(TableCell tableCell) {
                 return list(Html.element("td",
-                    MammothLists.cons(Html.FORCE_WRITE, convertChildrenToHtml(tableCell))));
+                    Lists.cons(Html.FORCE_WRITE, convertChildrenToHtml(tableCell))));
             }
 
             @Override
@@ -216,7 +216,7 @@ public class DocumentToHtml {
                             return list(Html.selfClosingElement("img", attributes));
                         } catch (IOException exception) {
                             warnings.add(exception.getMessage());
-                            return MammothLists.<HtmlNode>list();
+                            return Lists.<HtmlNode>list();
                         }
                     })
                     .orElse(list());
diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/Notes.java b/src/main/java/org/zwobble/mammoth/internal/documents/Notes.java
index fdfa814..c88c31a 100644
--- a/src/main/java/org/zwobble/mammoth/internal/documents/Notes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Notes.java
@@ -4,8 +4,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.*;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.*;
 
 public class Notes {
     public final static Notes EMPTY = new Notes(list());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
index d528622..be2cbb9 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.docx;
 import org.zwobble.mammoth.internal.documents.*;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.util.InputStreamSupplier;
-import org.zwobble.mammoth.internal.util.MammothOptionals;
+import org.zwobble.mammoth.internal.util.Optionals;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 import org.zwobble.mammoth.internal.xml.XmlElementLike;
 import org.zwobble.mammoth.internal.xml.XmlElementList;
@@ -15,10 +15,10 @@ import java.util.function.Function;
 
 import static org.zwobble.mammoth.internal.docx.ReadResult.EMPTY_SUCCESS;
 import static org.zwobble.mammoth.internal.docx.ReadResult.success;
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFilter;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothSets.set;
-import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Sets.set;
+import static org.zwobble.mammoth.internal.util.Strings.trimLeft;
 
 public class BodyXmlReader {
     private static final Set<String> IMAGE_TYPES_SUPPORTED_BY_BROWSERS = set(
@@ -216,7 +216,7 @@ public class BodyXmlReader {
 
     private Optional<NumberingLevel> readNumbering(XmlElementLike properties) {
         XmlElementLike numberingProperties = properties.findChildOrEmpty("w:numPr");
-        return MammothOptionals.flatMap(
+        return Optionals.flatMap(
             readVal(numberingProperties, "w:numId"),
             readVal(numberingProperties, "w:ilvl"),
             numbering::findLevel);
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
index b2677b2..d3f1c1f 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
@@ -1,18 +1,18 @@
 package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.internal.util.MammothMaps;
+import org.zwobble.mammoth.internal.util.Maps;
 import org.zwobble.mammoth.internal.util.Paths;
 
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class ContentTypes {
     public static final ContentTypes DEFAULT = new ContentTypes(map(), map());
 
-    private static final Map<String, String> imageExtensions = MammothMaps.<String, String>builder()
+    private static final Map<String, String> imageExtensions = Maps.<String, String>builder()
         .put("png", "png")
         .put("gif", "gif")
         .put("jpeg", "jpeg")
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
index 20bb0ab..0347362 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
@@ -5,9 +5,9 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
-import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
+import static org.zwobble.mammoth.internal.util.Strings.trimLeft;
 
 public class ContentTypesXml {
     public static ContentTypes readContentTypesXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
index 93caee4..f302c6d 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.docx;
 import org.zwobble.mammoth.internal.documents.Document;
 import org.zwobble.mammoth.internal.documents.Notes;
 import org.zwobble.mammoth.internal.results.InternalResult;
-import org.zwobble.mammoth.internal.util.MammothLists;
+import org.zwobble.mammoth.internal.util.Lists;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.io.IOException;
@@ -13,7 +13,7 @@ import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class DocumentReader {
     @FunctionalInterface
@@ -71,7 +71,7 @@ public class DocumentReader {
             tryParseOfficeXml(file, "word/endnotes.xml")
                 .map(NotesXmlReader.endnote(bodyReaders.forName("endnotes"))::readElement)
                 .orElse(InternalResult.success(list())),
-            MammothLists::eagerConcat).map(Notes::new);
+            Lists::eagerConcat).map(Notes::new);
     }
 
     private static Styles readStyles(DocxFile file) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
index c17346c..c4ef2c3 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
@@ -10,8 +10,8 @@ import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.eagerMapValues;
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.eagerMapValues;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
 import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
 
 public class InMemoryDocxFile implements DocxFile {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
index b75df9b..e70b1d4 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
@@ -7,7 +7,7 @@ import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.List;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFilter;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter;
 
 public class NotesXmlReader {
     public static NotesXmlReader footnote(BodyXmlReader bodyReader) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
index 9208c82..5ee09db 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
@@ -5,8 +5,8 @@ import org.zwobble.mammoth.internal.documents.NumberingLevel;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Numbering {
     public static final Numbering EMPTY = new Numbering(map());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
index 2167171..1f2fd41 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -7,9 +7,9 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
 
 public class NumberingXml {
     public static Numbering readNumberingXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
index 4088df5..b3a90d6 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
@@ -6,8 +6,8 @@ import org.zwobble.mammoth.internal.xml.parsing.XmlParser;
 import java.io.InputStream;
 import java.util.List;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.eagerFlatMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.eagerFlatMap;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class OfficeXml {
     private static NamespacePrefixes XML_NAMESPACES = NamespacePrefixes.builder()
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
index 24710c9..fa38338 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
@@ -7,9 +7,9 @@ import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyConcat;
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFlatMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.*;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyConcat;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFlatMap;
+import static org.zwobble.mammoth.internal.util.Lists.*;
 
 public class ReadResult {
     public static final ReadResult EMPTY_SUCCESS = success(list());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
index 7e8c14c..c1dd511 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
@@ -2,8 +2,8 @@ package org.zwobble.mammoth.internal.docx;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Relationships {
     public static final Relationships EMPTY = new Relationships(map());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
index 0c65e55..a63065b 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
@@ -4,8 +4,8 @@ import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
 
 public class RelationshipsXml {
     public static Relationships readRelationshipsXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
index 5b9b131..7271bd0 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
@@ -5,8 +5,8 @@ import org.zwobble.mammoth.internal.documents.Style;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Styles {
     public static final Styles EMPTY = new Styles(map(), map());
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
index 81a16af..625b830 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
@@ -7,9 +7,9 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFilter;
-import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
-import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter;
+import static org.zwobble.mammoth.internal.util.Maps.entry;
+import static org.zwobble.mammoth.internal.util.Maps.toMap;
 
 public class StylesXml {
     public static Styles readStylesXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/html/Html.java b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
index 8f4d671..f0a01dd 100644
--- a/src/main/java/org/zwobble/mammoth/internal/html/Html.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
@@ -1,16 +1,16 @@
 package org.zwobble.mammoth.internal.html;
 
-import org.zwobble.mammoth.internal.util.MammothLists;
-import org.zwobble.mammoth.internal.util.MammothOptionals;
+import org.zwobble.mammoth.internal.util.Lists;
+import org.zwobble.mammoth.internal.util.Optionals;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import static org.zwobble.mammoth.internal.util.Casts.tryCast;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothLists.tryGetLast;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Lists.tryGetLast;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Html {
     public static final HtmlNode FORCE_WRITE = HtmlForceWrite.FORCE_WRITE;
@@ -70,7 +70,7 @@ public class Html {
     }
 
     public static List<HtmlNode> stripEmpty(List<HtmlNode> nodes) {
-        return MammothLists.eagerFlatMap(nodes, node -> stripEmpty(node));
+        return Lists.eagerFlatMap(nodes, node -> stripEmpty(node));
     }
 
     private static List<HtmlNode> stripEmpty(HtmlNode node) {
@@ -156,7 +156,7 @@ public class Html {
     }
 
     private static boolean tryCollapse(List<HtmlNode> collapsed, HtmlNode node) {
-        return MammothOptionals.map(
+        return Optionals.map(
             tryGetLast(collapsed).flatMap(last -> tryCast(HtmlElement.class, last)),
             tryCast(HtmlElement.class, node),
             (last, next) -> {
diff --git a/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
index 6a87567..8747af1 100644
--- a/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
@@ -2,7 +2,7 @@ package org.zwobble.mammoth.internal.html;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.orderedBy;
+import static org.zwobble.mammoth.internal.util.Lists.orderedBy;
 
 public class HtmlWriter {
     public static void write(HtmlNode node, StringBuilder builder) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
index 5be56ed..b2e892b 100644
--- a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
@@ -9,11 +9,11 @@ import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyConcat;
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFlatMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.eagerMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothSets.toSet;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyConcat;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyFlatMap;
+import static org.zwobble.mammoth.internal.util.Lists.eagerMap;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Sets.toSet;
 
 public class InternalResult<T> {
     public static <T, R> InternalResult<List<R>> flatMap(Iterable<T> iterable, Function<T, InternalResult<R>> function) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java b/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java
index 9f1d63d..3aaf655 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java
@@ -2,7 +2,7 @@ package org.zwobble.mammoth.internal.styles;
 
 import org.zwobble.mammoth.internal.styles.parsing.StyleMapParser;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class DefaultStyles {
     public static final StyleMap DEFAULT_STYLE_MAP = StyleMapParser.parseStyleMappings(list(
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
index 59c0908..93025d9 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
@@ -5,9 +5,9 @@ import org.zwobble.mammoth.internal.html.HtmlNode;
 import java.util.List;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothLists.reversed;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Lists.reversed;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlPath {
     public static final HtmlPath EMPTY = new HtmlPath(list());
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
index 7f110a4..08221eb 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
@@ -6,8 +6,8 @@ import org.zwobble.mammoth.internal.html.HtmlNode;
 import java.util.List;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlPathElement {
     public static HtmlPathElement fresh(String tagName) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
index 5f2903b..81dfe80 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
@@ -2,13 +2,13 @@ package org.zwobble.mammoth.internal.styles;
 
 import org.zwobble.mammoth.internal.documents.Paragraph;
 import org.zwobble.mammoth.internal.documents.Run;
-import org.zwobble.mammoth.internal.util.MammothLists;
-import org.zwobble.mammoth.internal.util.MammothOptionals;
+import org.zwobble.mammoth.internal.util.Lists;
+import org.zwobble.mammoth.internal.util.Optionals;
 
 import java.util.List;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.tryFind;
+import static org.zwobble.mammoth.internal.util.Iterables.tryFind;
 
 public class StyleMap {
     public static StyleMapBuilder builder() {
@@ -43,12 +43,12 @@ public class StyleMap {
     public StyleMap update(StyleMap styleMap) {
         // TODO: add appropriate tests
         return new StyleMap(
-            MammothOptionals.first(styleMap.bold, bold),
-            MammothOptionals.first(styleMap.italic, italic),
-            MammothOptionals.first(styleMap.underline, underline),
-            MammothOptionals.first(styleMap.strikethrough, strikethrough),
-            MammothLists.eagerConcat(styleMap.paragraphStyles, paragraphStyles),
-            MammothLists.eagerConcat(styleMap.runStyles, runStyles));
+            Optionals.first(styleMap.bold, bold),
+            Optionals.first(styleMap.italic, italic),
+            Optionals.first(styleMap.underline, underline),
+            Optionals.first(styleMap.strikethrough, strikethrough),
+            Lists.eagerConcat(styleMap.paragraphStyles, paragraphStyles),
+            Lists.eagerConcat(styleMap.runStyles, runStyles));
     }
 
     public Optional<HtmlPath> getBold() {
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
index a21df44..c006319 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
@@ -12,7 +12,7 @@ import java.math.BigInteger;
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class StyleMappingParser extends BaseParser<StyleMapBuilder> {
     Rule StyleMapping(Var<StyleMapBuilder> styleMap) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
index 11f4f52..e9246c3 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Iterables.java
@@ -7,7 +7,7 @@ import java.util.function.Predicate;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-public class MammothIterables {
+public class Iterables {
     public static <T> Optional<T> tryFind(Iterable<T> iterable, Predicate<T> predicate) {
         for (T element : iterable) {
             if (predicate.test(element)) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java b/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
index 10d5be3..fc45c19 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Lists.java
@@ -7,9 +7,9 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
-import static org.zwobble.mammoth.internal.util.MammothIterables.stream;
+import static org.zwobble.mammoth.internal.util.Iterables.stream;
 
-public class MammothLists {
+public class Lists {
     public static <T> List<T> list() {
         return Collections.emptyList();
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java b/src/main/java/org/zwobble/mammoth/internal/util/Maps.java
index d3ba8c5..76ce5cf 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Maps.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.util;
 import java.util.*;
 import java.util.function.Function;
 
-public class MammothMaps {
+public class Maps {
     public static <K, V> Map<K, V> map() {
         return Collections.emptyMap();
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothOptionals.java b/src/main/java/org/zwobble/mammoth/internal/util/Optionals.java
index 6f2c100..d98b579 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothOptionals.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Optionals.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.util;
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-public class MammothOptionals {
+public class Optionals {
     public static <T> Optional<T> first(Optional<T> first, Optional<T> second) {
         if (first.isPresent()) {
             return first;
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothSets.java b/src/main/java/org/zwobble/mammoth/internal/util/Sets.java
index 4f06efc..c979740 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothSets.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Sets.java
@@ -6,9 +6,9 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import static java.util.Arrays.asList;
-import static org.zwobble.mammoth.internal.util.MammothIterables.stream;
+import static org.zwobble.mammoth.internal.util.Iterables.stream;
 
-public class MammothSets {
+public class Sets {
     public static <T> Set<T> set() {
         return Collections.emptySet();
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothStrings.java b/src/main/java/org/zwobble/mammoth/internal/util/Strings.java
index e5f98aa..4f173ad 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothStrings.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Strings.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.internal.util;
 
-public class MammothStrings {
+public class Strings {
     public static String trimLeft(String value, char character) {
         int index = 0;
         while (index < value.length() && value.charAt(index) == character) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/NamespacePrefixes.java b/src/main/java/org/zwobble/mammoth/internal/xml/NamespacePrefixes.java
index 82872bd..2287723 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/NamespacePrefixes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/NamespacePrefixes.java
@@ -4,7 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
 
 public class NamespacePrefixes {
     public static Builder builder() {
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
index e82b14e..2910fd0 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
@@ -4,9 +4,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.*;
-import static org.zwobble.mammoth.internal.util.MammothLists.toList;
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
+import static org.zwobble.mammoth.internal.util.Iterables.*;
+import static org.zwobble.mammoth.internal.util.Lists.toList;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
 
 public class XmlElement implements XmlNode, XmlElementLike {
     private final String name;
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementList.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementList.java
index ef41c4e..a14c39c 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementList.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementList.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.xml;
 import java.util.Iterator;
 import java.util.List;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.eagerFlatMap;
+import static org.zwobble.mammoth.internal.util.Lists.eagerFlatMap;
 
 public class XmlElementList implements Iterable<XmlElement> {
     private final List<XmlElement> elements;
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodes.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodes.java
index 3b4bab7..e5155ae 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodes.java
@@ -3,8 +3,8 @@ package org.zwobble.mammoth.internal.xml;
 import java.util.List;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class XmlNodes {
     public static XmlElement element(String name) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
index 08a2c4e..c76e989 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
@@ -9,8 +9,8 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.eagerMapKeys;
-import static org.zwobble.mammoth.internal.util.MammothStrings.isNullOrEmpty;
+import static org.zwobble.mammoth.internal.util.Maps.eagerMapKeys;
+import static org.zwobble.mammoth.internal.util.Strings.isNullOrEmpty;
 
 public class XmlParser {
     private final NamespacePrefixes namespaces;
diff --git a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java
index 35175d6..94bd05a 100644
--- a/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java
+++ b/src/test/java/org/zwobble/mammoth/tests/DeepReflectionMatcher.java
@@ -4,7 +4,7 @@ import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
-import org.zwobble.mammoth.internal.util.MammothSets;
+import org.zwobble.mammoth.internal.util.Sets;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -14,10 +14,10 @@ import java.util.Optional;
 import java.util.Set;
 
 import static java.util.Arrays.asList;
-import static org.zwobble.mammoth.internal.util.MammothIterables.any;
-import static org.zwobble.mammoth.internal.util.MammothIterables.lazyMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.eagerFilter;
-import static org.zwobble.mammoth.internal.util.MammothLists.skip;
+import static org.zwobble.mammoth.internal.util.Iterables.any;
+import static org.zwobble.mammoth.internal.util.Iterables.lazyMap;
+import static org.zwobble.mammoth.internal.util.Lists.eagerFilter;
+import static org.zwobble.mammoth.internal.util.Lists.skip;
 
 public class DeepReflectionMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
     public static <T> Matcher<T> deepEquals(T value) {
@@ -143,7 +143,7 @@ public class DeepReflectionMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
     }
 
     private static boolean handleExtraElements(String path, Map<?, ?> expected, Map<?, ?> actual, Description mismatchDescription, String prefix) {
-        Set<?> extraElements = MammothSets.difference(actual.keySet(), expected.keySet());
+        Set<?> extraElements = Sets.difference(actual.keySet(), expected.keySet());
         if (!extraElements.isEmpty()) {
             appendPath(mismatchDescription, path);
             mismatchDescription.appendText(prefix +
diff --git a/src/test/java/org/zwobble/mammoth/tests/DocumentToHtmlTests.java b/src/test/java/org/zwobble/mammoth/tests/DocumentToHtmlTests.java
index fb8d2a5..e2cc6c1 100644
--- a/src/test/java/org/zwobble/mammoth/tests/DocumentToHtmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/DocumentToHtmlTests.java
@@ -22,9 +22,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.zwobble.mammoth.internal.documents.VerticalAlignment.SUBSCRIPT;
 import static org.zwobble.mammoth.internal.documents.VerticalAlignment.SUPERSCRIPT;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
-import static org.zwobble.mammoth.internal.util.MammothSets.set;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
+import static org.zwobble.mammoth.internal.util.Sets.set;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.ResultMatchers.isInternalSuccess;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.*;
diff --git a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
index 8ac7af3..b2661b0 100644
--- a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
@@ -12,7 +12,7 @@ import java.util.function.Function;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.tests.ResultMatchers.isResult;
 import static org.zwobble.mammoth.tests.ResultMatchers.isSuccess;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/ResultMatchers.java b/src/test/java/org/zwobble/mammoth/tests/ResultMatchers.java
index c66fbff..d7eb780 100644
--- a/src/test/java/org/zwobble/mammoth/tests/ResultMatchers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/ResultMatchers.java
@@ -7,8 +7,8 @@ import org.zwobble.mammoth.Result;
 import org.zwobble.mammoth.internal.results.InternalResult;
 
 import static org.hamcrest.Matchers.*;
-import static org.zwobble.mammoth.internal.util.MammothLists.eagerMap;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.eagerMap;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 
 public class ResultMatchers {
diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
index 9ca658e..3048acd 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
@@ -11,7 +11,7 @@ import static com.natpryce.makeiteasy.MakeItEasy.a;
 import static com.natpryce.makeiteasy.MakeItEasy.make;
 import static com.natpryce.makeiteasy.MakeItEasy.with;
 import static com.natpryce.makeiteasy.Property.newProperty;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class DocumentElementMakers {
     public static final Property<DocumentElement, Optional<Style>> STYLE = newProperty();
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
index 21c9ac1..6c4d6b5 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -26,8 +26,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.zwobble.mammoth.internal.documents.NoteReference.endnoteReference;
 import static org.zwobble.mammoth.internal.documents.NoteReference.footnoteReference;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
index 801fd43..b09431c 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
@@ -8,8 +8,8 @@ import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
 import static org.zwobble.mammoth.internal.docx.ContentTypesXml.readContentTypesXmlElement;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class ContentTypesXmlTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
index 770b290..23d0f05 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
@@ -13,7 +13,7 @@ import org.zwobble.mammoth.internal.xml.XmlNodes;
 import static com.natpryce.makeiteasy.MakeItEasy.a;
 import static com.natpryce.makeiteasy.MakeItEasy.make;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.ResultMatchers.isInternalSuccess;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java b/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java
index 0193268..bce4568 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java
@@ -8,7 +8,7 @@ import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
+import static org.zwobble.mammoth.internal.util.Maps.lookup;
 
 public class InMemoryFileReader implements FileReader {
     private final Map<String, String> entries;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
index e3a1530..e989111 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
@@ -13,8 +13,8 @@ import java.util.List;
 import static com.natpryce.makeiteasy.MakeItEasy.a;
 import static com.natpryce.makeiteasy.MakeItEasy.make;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 import static org.zwobble.mammoth.tests.ResultMatchers.isInternalSuccess;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.PARAGRAPH;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
index e55b998..e7ffbcc 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
@@ -8,8 +8,8 @@ import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
 import static org.zwobble.mammoth.internal.docx.NumberingXml.readNumberingXmlElement;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class NumberingXmlTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
index cd63457..a7a729a 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
@@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class OfficeXmlTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
index f9a7672..a8300df 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
@@ -4,7 +4,7 @@ import org.junit.Test;
 import org.zwobble.mammoth.internal.docx.Relationships;
 
 import static org.junit.Assert.assertEquals;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.tests.util.MammothAsserts.assertThrows;
 
 public class RelationshipsTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
index a21c7c8..40ce85e 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
@@ -6,8 +6,8 @@ import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import static org.junit.Assert.assertEquals;
 import static org.zwobble.mammoth.internal.docx.RelationshipsXml.readRelationshipsXmlElement;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class RelationshipsXmlTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
index 9178256..55f3f13 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
@@ -8,8 +8,8 @@ import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
 import static org.zwobble.mammoth.internal.docx.StylesXml.readStylesXmlElement;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class StylesXmlTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
index 29af738..83c785d 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
@@ -5,8 +5,8 @@ import org.zwobble.mammoth.internal.html.Html;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlCollapseTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
index f17dbc7..87aba9a 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
@@ -5,7 +5,7 @@ import org.zwobble.mammoth.internal.html.Html;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class HtmlStripEmptyTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
index 4dc23cc..6ed9009 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
@@ -5,8 +5,8 @@ import org.zwobble.mammoth.internal.html.Html;
 import org.zwobble.mammoth.internal.html.HtmlNode;
 
 import static org.junit.Assert.assertEquals;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlWriteTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java
index af2591e..3fe1278 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java
@@ -9,8 +9,8 @@ import org.zwobble.mammoth.internal.styles.parsing.StyleMappingParser;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlPathParsingTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
index 8b26de4..30b7c28 100644
--- a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
@@ -16,8 +16,8 @@ import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class XmlParserTests {
     private final XmlParser parser = new XmlParser(new NamespacePrefixes(map()));