From 88c6377432c7786580820945229b11f6bfed378b Mon Sep 17 00:00:00 2001
From: Dan Cox <daniel.57@Gmail.com>
Date: Thu, 21 Sep 2023 14:39:20 -0400
Subject: [PATCH] Updating naming for Twine1HTML and Twine2HTML

---
 index.js                                      |  12 +--
 src/JSONParser.js                             |   4 +
 src/JSONWriter.js                             |   4 +
 src/TWSParser.js                              |   4 +
 src/{HTMLParser.js => Twine2HTMLParser.js}    |  10 +-
 src/{HTMLWriter.js => Twine2HTMLWriter.js}    |   8 +-
 test/Roundtrip.test.js                        |  10 +-
 test/Roundtrip/round.html                     |   2 +-
 test/TweeWriter/test1.twee                    |   2 +-
 test/TweeWriter/test5.twee                    |   2 +-
 test/TweeWriter/test6.twee                    |   2 +-
 test/TweeWriter/test7.twee                    |   2 +-
 ...arser.test.js => Twine2HTMLParser.test.js} | 100 +++++++++---------
 .../Example1.html                             |   0
 .../Tags.html                                 |   0
 .../lyingStartnode.html                       |   0
 .../lyingTagColors.html                       |   0
 .../missingCreator.html                       |   0
 .../missingCreatorVersion.html                |   0
 .../missingFormat.html                        |   0
 .../missingFormatVersion.html                 |   0
 .../missingIFID.html                          |   0
 .../missingName.html                          |   0
 .../missingPID.html                           |   0
 .../missingPassageName.html                   |   0
 .../missingPassageTags.html                   |   0
 .../missingPosition.html                      |   0
 .../missingScript.html                        |   0
 .../missingSize.html                          |   0
 .../missingStartnode.html                     |   0
 .../missingStyle.html                         |   0
 .../missingZoom.html                          |   0
 .../tagColors.html                            |   0
 .../twineExample.html                         |   0
 .../twineExample2.html                        |   0
 .../twineExample3.html                        |   0
 ...riter.test.js => Twine2HTMLWriter.test.js} |  70 ++++++------
 .../TestTags.html                             |   0
 .../creator.html                              |   2 +-
 .../example6.twee                             |   0
 .../missingStoryTitle.twee                    |   0
 .../test11.html                               |   0
 .../test2.html                                |   0
 .../test3.html                                |   0
 .../test4.html                                |   2 +-
 .../test6.html                                |   2 +-
 46 files changed, 125 insertions(+), 113 deletions(-)
 rename src/{HTMLParser.js => Twine2HTMLParser.js} (97%)
 rename src/{HTMLWriter.js => Twine2HTMLWriter.js} (97%)
 rename test/{HTMLParser.test.js => Twine2HTMLParser.test.js} (57%)
 rename test/{HTMLParser => Twine2HTMLParser}/Example1.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/Tags.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/lyingStartnode.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/lyingTagColors.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingCreator.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingCreatorVersion.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingFormat.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingFormatVersion.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingIFID.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingName.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingPID.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingPassageName.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingPassageTags.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingPosition.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingScript.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingSize.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingStartnode.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingStyle.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/missingZoom.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/tagColors.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/twineExample.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/twineExample2.html (100%)
 rename test/{HTMLParser => Twine2HTMLParser}/twineExample3.html (100%)
 rename test/{HTMLWriter.test.js => Twine2HTMLWriter.test.js} (73%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/TestTags.html (100%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/creator.html (99%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/example6.twee (100%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/missingStoryTitle.twee (100%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/test11.html (100%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/test2.html (100%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/test3.html (100%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/test4.html (99%)
 rename test/{HTMLWriter => Twine2HTMLWriter}/test6.html (99%)

diff --git a/index.js b/index.js
index 42678cdc..17d11361 100644
--- a/index.js
+++ b/index.js
@@ -2,8 +2,8 @@ import FileReader from './src/FileReader.js';
 import TweeParser from './src/TweeParser.js';
 import TweeWriter from './src/TweeWriter.js';
 import StoryFormatParser from './src/StoryFormatParser.js';
-import HTMLParser from './src/HTMLParser.js';
-import HTMLWriter from './src/HTMLWriter.js';
+import Twine2HTMLParser from './src/Twine2HTMLParser.js';
+import Twine2HTMLWriter from './src/Twine2HTMLWriter.js';
 import Story from './src/Story.js';
 import Passage from './src/Passage.js';
 import StoryFormat from './src/StoryFormat.js';
@@ -14,8 +14,8 @@ export { StoryFormat };
 export { Passage };
 export { Story };
 export { StoryFormatParser };
-export { HTMLParser };
-export { HTMLWriter };
+export { Twine2HTMLParser };
+export { Twine2HTMLWriter };
 
 // Export everything by default
 export default {
@@ -26,6 +26,6 @@ export default {
     Passage,
     Story,
     parseStoryFormat: StoryFormatParser.parse,
-    parseHTML: HTMLParser.parse,
-    writeHTML: HTMLWriter.write
+    parseHTML: Twine2HTMLParser.parse,
+    writeHTML: Twine2HTMLWriter.write
 };
diff --git a/src/JSONParser.js b/src/JSONParser.js
index b309332c..d559277c 100644
--- a/src/JSONParser.js
+++ b/src/JSONParser.js
@@ -2,6 +2,10 @@ import Story from './Story.js';
 import StoryFormat from './StoryFormat.js';
 import Passage from './Passage.js';
 
+/**
+ * @class JSONParser
+ * @module JSONParser
+ */
 export default class JSONParser {
   /**
    * Import JSON string and return Story object.
diff --git a/src/JSONWriter.js b/src/JSONWriter.js
index 0f6742be..5e5abf03 100644
--- a/src/JSONWriter.js
+++ b/src/JSONWriter.js
@@ -2,6 +2,10 @@ import Story from './Story.js';
 import StoryFormat from './StoryFormat.js';
 import Passage from './Passage.js';
 
+/**
+ * @class JSONWriter
+ * @module JSONWriter
+ */
 export default class JSONWriter {
   /**
    * Export Story as JSON string.
diff --git a/src/TWSParser.js b/src/TWSParser.js
index 782be2c6..6a03f67b 100644
--- a/src/TWSParser.js
+++ b/src/TWSParser.js
@@ -2,6 +2,10 @@ import Story from './Story.js';
 import Passage from './Passage.js';
 import { Parser } from 'pickleparser';
 
+/**
+ * @class TWSParser
+ * @module TWSParser
+ */
 export default class TWSParser {
   /**
    * Parse TWS file (as Buffer) into Story.
diff --git a/src/HTMLParser.js b/src/Twine2HTMLParser.js
similarity index 97%
rename from src/HTMLParser.js
rename to src/Twine2HTMLParser.js
index d57efbbe..f772ac5c 100644
--- a/src/HTMLParser.js
+++ b/src/Twine2HTMLParser.js
@@ -7,10 +7,10 @@ import { parse as HtmlParser } from 'node-html-parser';
 import Story from './Story.js';
 import Passage from './Passage.js';
 /**
- * @class HTMLParser
- * @module HTMLParser
+ * @class Twine2HTMLParser
+ * @module Twine2HTMLParser
  */
-export default class HTMLParser {
+export default class Twine2HTMLParser {
   /**
    * Parse HTML text into a JS DOM-like object
    * @public
@@ -168,7 +168,7 @@ export default class HTMLParser {
       // Does name exist?
       if (Object.prototype.hasOwnProperty.call(attr, 'name')) {
         // Escape the name
-        name = HTMLParser.escapeMetacharacters(attr.name);
+        name = Twine2HTMLParser.escapeMetacharacters(attr.name);
       } else {
         console.warn('Encountered passage without a name! Will not add.');
       }
@@ -181,7 +181,7 @@ export default class HTMLParser {
         // (Attributes can, themselves, be empty strings.)
         if (attr.tags.length > 0 && attr.tags !== '""') {
           // Escape the tags
-          tags = HTMLParser.escapeMetacharacters(attr.tags);
+          tags = Twine2HTMLParser.escapeMetacharacters(attr.tags);
           // Split by spaces into an array
           tags = tags.split(' ');
         }
diff --git a/src/HTMLWriter.js b/src/Twine2HTMLWriter.js
similarity index 97%
rename from src/HTMLWriter.js
rename to src/Twine2HTMLWriter.js
index 461619dd..3d996d24 100644
--- a/src/HTMLWriter.js
+++ b/src/Twine2HTMLWriter.js
@@ -11,10 +11,10 @@ import StoryFormat from './StoryFormat.js';
 import { v4 as uuidv4 } from 'uuid';
 
 /**
- * @class HTMLWriter
- * @module HTMLWriter
+ * @class Twine2HTMLWriter
+ * @module Twine2HTMLWriter
  */
-export default class HTMLWriter {
+export default class Twine2HTMLWriter {
   /**
    * Write story to file using story format and adding any CSS and JS
    * @public
@@ -174,7 +174,7 @@ export default class HTMLWriter {
         storyData += `size="${passage.metadata.size}" `;
       }
 
-      storyData += `>${HTMLWriter.escape(passage.text)}</tw-passagedata>\n`;
+      storyData += `>${Twine2HTMLWriter.escape(passage.text)}</tw-passagedata>\n`;
     });
 
     storyData += '</tw-storydata>';
diff --git a/test/Roundtrip.test.js b/test/Roundtrip.test.js
index 180806b7..3862e640 100644
--- a/test/Roundtrip.test.js
+++ b/test/Roundtrip.test.js
@@ -1,16 +1,16 @@
 import TweeWriter from '../src/TweeWriter.js';
 import FileReader from '../src/FileReader.js';
 import TweeParser from '../src/TweeParser.js';
-import HTMLParser from '../src/HTMLParser.js';
+import Twine2HTMLParser from '../src/Twine2HTMLParser.js';
 import StoryFormatParser from '../src/StoryFormatParser.js';
-import HTMLWriter from '../src/HTMLWriter.js';
+import Twine2HTMLWriter from '../src/Twine2HTMLWriter.js';
 
 describe('Round-trip testing', () => {
   it('Should round-trip HTML-to-Twee', () => {
     // Read HTML
     const fr = FileReader.read('test/Roundtrip/Example1.html');
     // Parse HTML
-    const s = HTMLParser.parse(fr);
+    const s = Twine2HTMLParser.parse(fr);
     // Write Story into Twee
     TweeWriter.write(s, 'test/Roundtrip/example1.twee');
     // Read new Twee file
@@ -33,11 +33,11 @@ describe('Round-trip testing', () => {
     // Parse Twee
     const story = TweeParser.parse(fr);
     // Write HTML
-    HTMLWriter.write('test/Roundtrip/round.html', story, sfp);
+    Twine2HTMLWriter.write('test/Roundtrip/round.html', story, sfp);
     // Read HTML
     const fr2 = FileReader.read('test/Roundtrip/round.html');
     // Parse HTML
-    const story2 = HTMLParser.parse(fr2);
+    const story2 = Twine2HTMLParser.parse(fr2);
     // Number of passages should be the same, too
     expect(story2.size()).toBe(story.size());
     // IFID should be the same
diff --git a/test/Roundtrip/round.html b/test/Roundtrip/round.html
index 85a6b0cd..fe0e781f 100644
--- a/test/Roundtrip/round.html
+++ b/test/Roundtrip/round.html
@@ -11,7 +11,7 @@
 
 <tw-story></tw-story>
 
-<tw-storydata name="Example1" startnode="4" creator="extwee" creator-version="2.2.0" ifid="88E7B722-EFB3-4BF2-A0DE-5B5250F5EA15" zoom="0" format="Harlowe" format-version="3.0.2" options hidden>
+<tw-storydata name="Example1" startnode="4" creator="extwee" creator-version="2.2.0" ifid="214A6942-C55D-49FD-9D0D-DE716FB0DD04" zoom="0" format="Harlowe" format-version="3.0.2" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
 	<tw-passagedata pid="4" name="Start">[[Another passage]]</tw-passagedata>
diff --git a/test/TweeWriter/test1.twee b/test/TweeWriter/test1.twee
index 56191b77..b823c929 100644
--- a/test/TweeWriter/test1.twee
+++ b/test/TweeWriter/test1.twee
@@ -1,6 +1,6 @@
 :: StoryData
 {
-  "ifid": "917412E3-50AF-4879-970F-95969B21DC16",
+  "ifid": "77A26FEB-C64C-45FB-AAD7-3FADF6C8890A",
   "format": "Test",
   "format-version": "1.2.3",
   "zoom": 1,
diff --git a/test/TweeWriter/test5.twee b/test/TweeWriter/test5.twee
index 4436478d..84fe766a 100644
--- a/test/TweeWriter/test5.twee
+++ b/test/TweeWriter/test5.twee
@@ -1,6 +1,6 @@
 :: StoryData
 {
-  "ifid": "7BD104CB-EC06-43C0-BA86-ECC58115CCEF",
+  "ifid": "369D9840-D64A-4205-9B6D-AACFC9F64F22",
   "start": "Start",
   "tag-colors": {
     "bar": "green",
diff --git a/test/TweeWriter/test6.twee b/test/TweeWriter/test6.twee
index 1a28d4ca..c3f01772 100644
--- a/test/TweeWriter/test6.twee
+++ b/test/TweeWriter/test6.twee
@@ -1,6 +1,6 @@
 :: StoryData
 {
-  "ifid": "B84C9DCD-36BA-48C0-A9E6-E90E37DCF0E4",
+  "ifid": "76EBB89F-5C2A-42E3-8680-61E13968A5F0",
   "start": "Start"
 }
 
diff --git a/test/TweeWriter/test7.twee b/test/TweeWriter/test7.twee
index 3777a75c..d41161ae 100644
--- a/test/TweeWriter/test7.twee
+++ b/test/TweeWriter/test7.twee
@@ -1,6 +1,6 @@
 :: StoryData
 {
-  "ifid": "28AE110F-B2A8-4F3B-8F01-9DDE2F14AE90",
+  "ifid": "BEBC61C8-ACD1-4B30-B946-4F738D865751",
   "start": "Start"
 }
 
diff --git a/test/HTMLParser.test.js b/test/Twine2HTMLParser.test.js
similarity index 57%
rename from test/HTMLParser.test.js
rename to test/Twine2HTMLParser.test.js
index 01ae3cec..95d90fbb 100644
--- a/test/HTMLParser.test.js
+++ b/test/Twine2HTMLParser.test.js
@@ -1,117 +1,117 @@
 import FileReader from '../src/FileReader.js';
-import HTMLParser from '../src/HTMLParser.js';
+import Twine2HTMLParser from '../src/Twine2HTMLParser.js';
 
 // Pull the name and version of this project from package.json.
 // These are used as the 'creator' and 'creator-version'.
 const { version } = JSON.parse(FileReader.read('package.json'));
 
-describe('HTMLParser', () => {
+describe('Twine2HTMLParser', () => {
   describe('#parse()', () => {
     it('Should throw error if content is not Twine-2 style HTML', () => {
-      expect(() => { HTMLParser.parse(''); }).toThrow();
+      expect(() => { Twine2HTMLParser.parse(''); }).toThrow();
     });
 
     it('Should be able to parse Twine 2 HTML for story name', () => {
-      const fr = FileReader.read('test/HTMLParser/twineExample.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/twineExample.html');
+      const story = Twine2HTMLParser.parse(fr);
       const storyTitle = story.getPassageByName('StoryTitle');
       expect(storyTitle.text).toBe('twineExample');
     });
 
     it('Should be able to parse Twine 2 HTML for correct number of passages', () => {
-      const fr = FileReader.read('test/HTMLParser/twineExample.html');
-      const tp = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/twineExample.html');
+      const tp = Twine2HTMLParser.parse(fr);
       expect(tp.size()).toBe(5);
     });
 
     it('Should be able to correctly parse passage tags', () => {
-      const fr = FileReader.read('test/HTMLParser/Tags.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/Tags.html');
+      const story = Twine2HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(p.tags).toHaveLength(2);
     });
 
     it('Should set a missing name to Untitled', () => {
-      const fr = FileReader.read('test/HTMLParser/missingName.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingName.html');
+      const story = Twine2HTMLParser.parse(fr);
       const p = story.getPassageByName('StoryTitle');
       expect(p.text).toBe('Untitled');
     });
 
     it('Should set a missing IFID to an empty string', () => {
-      const fr = FileReader.read('test/HTMLParser/missingIFID.html');
-      const tp = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingIFID.html');
+      const tp = Twine2HTMLParser.parse(fr);
       expect(tp.IFID).toBe('');
     });
 
     it('Should have Extwee for creator when missing', () => {
-      const fr = FileReader.read('test/HTMLParser/missingCreator.html');
-      const tp = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingCreator.html');
+      const tp = Twine2HTMLParser.parse(fr);
       expect(tp.creator).toBe('extwee');
     });
 
     it('Should have correct for creatorVersion when missing', () => {
-      const fr = FileReader.read('test/HTMLParser/missingCreatorVersion.html');
-      const tp = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingCreatorVersion.html');
+      const tp = Twine2HTMLParser.parse(fr);
       expect(tp.creatorVersion).toBe(version);
     });
 
     it('Should have empty string as format when missing', () => {
-      const fr = FileReader.read('test/HTMLParser/missingFormat.html');
-      const tp = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingFormat.html');
+      const tp = Twine2HTMLParser.parse(fr);
       expect(tp.format).toBe('');
     });
 
     it('Should have empty string as formatVersion when missing', () => {
-      const fr = FileReader.read('test/HTMLParser/missingFormatVersion.html');
-      const tp = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingFormatVersion.html');
+      const tp = Twine2HTMLParser.parse(fr);
       expect(tp.formatVersion).toBe('');
     });
 
     it('Should have empty string as zoom when missing', () => {
-      const fr = FileReader.read('test/HTMLParser/missingZoom.html');
-      const tp = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingZoom.html');
+      const tp = Twine2HTMLParser.parse(fr);
       expect(tp.zoom).toBe(0);
     });
 
     it('Should not have position if passage does not', () => {
-      const fr = FileReader.read('test/HTMLParser/missingPosition.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingPosition.html');
+      const story = Twine2HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(Object.prototype.hasOwnProperty.call(p.metadata, 'position')).toBe(false);
     });
 
     it('Should not have size if passage does not', () => {
-      const fr = FileReader.read('test/HTMLParser/missingSize.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingSize.html');
+      const story = Twine2HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(Object.prototype.hasOwnProperty.call(p.metadata, 'size')).toBe(false);
     });
 
     it('Should have empty array as tags if tags is missing', () => {
-      const fr = FileReader.read('test/HTMLParser/missingPassageTags.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingPassageTags.html');
+      const story = Twine2HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(p.tags).toHaveLength(0);
     });
 
     it('Should not have stylesheet tag if no passages exist with it', () => {
-      const fr = FileReader.read('test/HTMLParser/missingStyle.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingStyle.html');
+      const story = Twine2HTMLParser.parse(fr);
       const passages = story.getPassagesByTag('stylesheet');
       expect(passages.length).toBe(0);
     });
 
     it('Should not have script tag if no passages exist with it', () => {
-      const fr = FileReader.read('test/HTMLParser/missingScript.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingScript.html');
+      const story = Twine2HTMLParser.parse(fr);
       const passages = story.getPassagesByTag('script');
       expect(passages.length).toBe(0);
     });
 
     it('Should have script and style tags normally', () => {
-      const fr = FileReader.read('test/HTMLParser/Example1.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/Example1.html');
+      const story = Twine2HTMLParser.parse(fr);
       const scriptPassages = story.getPassagesByTag('script');
       const stylesheetPassages = story.getPassagesByTag('stylesheet');
       expect(scriptPassages.length).toBe(1);
@@ -119,50 +119,50 @@ describe('HTMLParser', () => {
     });
 
     it('Should not have start property if startNode does not exist when parsed', () => {
-      const fr = FileReader.read('test/HTMLParser/missingStartnode.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingStartnode.html');
+      const story = Twine2HTMLParser.parse(fr);
       expect(story.start).toBe('');
     });
 
     it('Should not add passages without names', () => {
-      const fr = FileReader.read('test/HTMLParser/missingPassageName.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingPassageName.html');
+      const story = Twine2HTMLParser.parse(fr);
       // There is only one passage, StoryTitle
       expect(story.size()).toBe(0);
     });
 
     it('Should not add passages without PID', () => {
-      const fr = FileReader.read('test/HTMLParser/missingPID.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingPID.html');
+      const story = Twine2HTMLParser.parse(fr);
       // There is only one passage, StoryTitle
       expect(story.size()).toBe(0);
     });
 
     it('Parse tag colors', () => {
-      const fr = FileReader.read('test/HTMLParser/tagColors.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/tagColors.html');
+      const story = Twine2HTMLParser.parse(fr);
       // Test for tag colors
       const tagColors = story.tagColors;
       expect(tagColors.a).toBe('red');
     });
 
     it('Will not set start if startnode is missing', () => {
-      const fr = FileReader.read('test/HTMLParser/missingStartnode.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/missingStartnode.html');
+      const story = Twine2HTMLParser.parse(fr);
       // Test for default start
       expect(story.start).toBe('');
     });
 
     it('Throw error when startnode has PID that does not exist', () => {
-      const fr = FileReader.read('test/HTMLParser/lyingStartnode.html');
+      const fr = FileReader.read('test/Twine2HTMLParser/lyingStartnode.html');
       expect(() => {
-        HTMLParser.parse(fr);
+        Twine2HTMLParser.parse(fr);
       }).toThrow();
     });
 
     it('Do not update name and color if those attributes do not exist', () => {
-      const fr = FileReader.read('test/HTMLParser/lyingTagColors.html');
-      const story = HTMLParser.parse(fr);
+      const fr = FileReader.read('test/Twine2HTMLParser/lyingTagColors.html');
+      const story = Twine2HTMLParser.parse(fr);
       const tagColorProperties = Object.keys(story.tagColors).length;
       expect(tagColorProperties).toBe(0);
     });
@@ -171,7 +171,7 @@ describe('HTMLParser', () => {
   describe('#escapeMetacharacters()', () => {
     it('Should escape metacharacters', () => {
       /* eslint no-useless-escape: "off" */
-      expect(HTMLParser.escapeMetacharacters('\\\{\\\}\\\[\\\]\\\\')).toBe('\\\\{\\\\}\\\\[\\\\]\\\\');
+      expect(Twine2HTMLParser.escapeMetacharacters('\\\{\\\}\\\[\\\]\\\\')).toBe('\\\\{\\\\}\\\\[\\\\]\\\\');
     });
   });
 });
diff --git a/test/HTMLParser/Example1.html b/test/Twine2HTMLParser/Example1.html
similarity index 100%
rename from test/HTMLParser/Example1.html
rename to test/Twine2HTMLParser/Example1.html
diff --git a/test/HTMLParser/Tags.html b/test/Twine2HTMLParser/Tags.html
similarity index 100%
rename from test/HTMLParser/Tags.html
rename to test/Twine2HTMLParser/Tags.html
diff --git a/test/HTMLParser/lyingStartnode.html b/test/Twine2HTMLParser/lyingStartnode.html
similarity index 100%
rename from test/HTMLParser/lyingStartnode.html
rename to test/Twine2HTMLParser/lyingStartnode.html
diff --git a/test/HTMLParser/lyingTagColors.html b/test/Twine2HTMLParser/lyingTagColors.html
similarity index 100%
rename from test/HTMLParser/lyingTagColors.html
rename to test/Twine2HTMLParser/lyingTagColors.html
diff --git a/test/HTMLParser/missingCreator.html b/test/Twine2HTMLParser/missingCreator.html
similarity index 100%
rename from test/HTMLParser/missingCreator.html
rename to test/Twine2HTMLParser/missingCreator.html
diff --git a/test/HTMLParser/missingCreatorVersion.html b/test/Twine2HTMLParser/missingCreatorVersion.html
similarity index 100%
rename from test/HTMLParser/missingCreatorVersion.html
rename to test/Twine2HTMLParser/missingCreatorVersion.html
diff --git a/test/HTMLParser/missingFormat.html b/test/Twine2HTMLParser/missingFormat.html
similarity index 100%
rename from test/HTMLParser/missingFormat.html
rename to test/Twine2HTMLParser/missingFormat.html
diff --git a/test/HTMLParser/missingFormatVersion.html b/test/Twine2HTMLParser/missingFormatVersion.html
similarity index 100%
rename from test/HTMLParser/missingFormatVersion.html
rename to test/Twine2HTMLParser/missingFormatVersion.html
diff --git a/test/HTMLParser/missingIFID.html b/test/Twine2HTMLParser/missingIFID.html
similarity index 100%
rename from test/HTMLParser/missingIFID.html
rename to test/Twine2HTMLParser/missingIFID.html
diff --git a/test/HTMLParser/missingName.html b/test/Twine2HTMLParser/missingName.html
similarity index 100%
rename from test/HTMLParser/missingName.html
rename to test/Twine2HTMLParser/missingName.html
diff --git a/test/HTMLParser/missingPID.html b/test/Twine2HTMLParser/missingPID.html
similarity index 100%
rename from test/HTMLParser/missingPID.html
rename to test/Twine2HTMLParser/missingPID.html
diff --git a/test/HTMLParser/missingPassageName.html b/test/Twine2HTMLParser/missingPassageName.html
similarity index 100%
rename from test/HTMLParser/missingPassageName.html
rename to test/Twine2HTMLParser/missingPassageName.html
diff --git a/test/HTMLParser/missingPassageTags.html b/test/Twine2HTMLParser/missingPassageTags.html
similarity index 100%
rename from test/HTMLParser/missingPassageTags.html
rename to test/Twine2HTMLParser/missingPassageTags.html
diff --git a/test/HTMLParser/missingPosition.html b/test/Twine2HTMLParser/missingPosition.html
similarity index 100%
rename from test/HTMLParser/missingPosition.html
rename to test/Twine2HTMLParser/missingPosition.html
diff --git a/test/HTMLParser/missingScript.html b/test/Twine2HTMLParser/missingScript.html
similarity index 100%
rename from test/HTMLParser/missingScript.html
rename to test/Twine2HTMLParser/missingScript.html
diff --git a/test/HTMLParser/missingSize.html b/test/Twine2HTMLParser/missingSize.html
similarity index 100%
rename from test/HTMLParser/missingSize.html
rename to test/Twine2HTMLParser/missingSize.html
diff --git a/test/HTMLParser/missingStartnode.html b/test/Twine2HTMLParser/missingStartnode.html
similarity index 100%
rename from test/HTMLParser/missingStartnode.html
rename to test/Twine2HTMLParser/missingStartnode.html
diff --git a/test/HTMLParser/missingStyle.html b/test/Twine2HTMLParser/missingStyle.html
similarity index 100%
rename from test/HTMLParser/missingStyle.html
rename to test/Twine2HTMLParser/missingStyle.html
diff --git a/test/HTMLParser/missingZoom.html b/test/Twine2HTMLParser/missingZoom.html
similarity index 100%
rename from test/HTMLParser/missingZoom.html
rename to test/Twine2HTMLParser/missingZoom.html
diff --git a/test/HTMLParser/tagColors.html b/test/Twine2HTMLParser/tagColors.html
similarity index 100%
rename from test/HTMLParser/tagColors.html
rename to test/Twine2HTMLParser/tagColors.html
diff --git a/test/HTMLParser/twineExample.html b/test/Twine2HTMLParser/twineExample.html
similarity index 100%
rename from test/HTMLParser/twineExample.html
rename to test/Twine2HTMLParser/twineExample.html
diff --git a/test/HTMLParser/twineExample2.html b/test/Twine2HTMLParser/twineExample2.html
similarity index 100%
rename from test/HTMLParser/twineExample2.html
rename to test/Twine2HTMLParser/twineExample2.html
diff --git a/test/HTMLParser/twineExample3.html b/test/Twine2HTMLParser/twineExample3.html
similarity index 100%
rename from test/HTMLParser/twineExample3.html
rename to test/Twine2HTMLParser/twineExample3.html
diff --git a/test/HTMLWriter.test.js b/test/Twine2HTMLWriter.test.js
similarity index 73%
rename from test/HTMLWriter.test.js
rename to test/Twine2HTMLWriter.test.js
index 83dd79e2..b9d637c7 100644
--- a/test/HTMLWriter.test.js
+++ b/test/Twine2HTMLWriter.test.js
@@ -1,27 +1,27 @@
 import FileReader from '../src/FileReader.js';
 import StoryFormatParser from '../src/StoryFormatParser.js';
-import HTMLParser from '../src/HTMLParser.js';
+import Twine2HTMLParser from '../src/Twine2HTMLParser.js';
 import TweeParser from '../src/TweeParser.js';
-import HTMLWriter from '../src/HTMLWriter.js';
+import Twine2HTMLWriter from '../src/Twine2HTMLWriter.js';
 import Story from '../src/Story.js';
 import Passage from '../src/Passage.js';
 
-describe('HTMLWriter', () => {
+describe('Twine2HTMLWriter', () => {
   describe('#write()', () => {
     it('story should be instanceof Story', () => {
-      expect(() => { HTMLWriter.write('test/HTMLWriter/test.html', {}); }).toThrow();
+      expect(() => { Twine2HTMLWriter.write('test/Twine2HTMLWriter/test.html', {}); }).toThrow();
     });
 
     it('storyFormat should be instanceof StoryFormat', () => {
       const s = new Story();
-      expect(() => { HTMLWriter.write('test/HTMLWriter/test.html', s, {}); }).toThrow();
+      expect(() => { Twine2HTMLWriter.write('test/Twine2HTMLWriter/test.html', s, {}); }).toThrow();
     });
 
     it('Read, write, and read HTML', () => {
       // Read HTML.
-      const fr = FileReader.read('test/HTMLParser/twineExample3.html');
+      const fr = FileReader.read('test/Twine2HTMLParser/twineExample3.html');
       // Parse HTML.
-      const story = HTMLParser.parse(fr);
+      const story = Twine2HTMLParser.parse(fr);
 
       const s1Title = story.getPassageByName('StoryTitle').text;
 
@@ -31,12 +31,12 @@ describe('HTMLWriter', () => {
       const storyFormat = StoryFormatParser.parse(fr2);
 
       // Write HTML.
-      HTMLWriter.write('test/HTMLWriter/test2.html', story, storyFormat);
+      Twine2HTMLWriter.write('test/Twine2HTMLWriter/test2.html', story, storyFormat);
 
       // Read HTML.
-      const fr3 = FileReader.read('test/HTMLWriter/test2.html');
+      const fr3 = FileReader.read('test/Twine2HTMLWriter/test2.html');
       // Parse HTML.
-      const story2 = HTMLParser.parse(fr3);
+      const story2 = Twine2HTMLParser.parse(fr3);
 
       // Test both names to be the same.
       expect(s1Title).toBe(story2.name);
@@ -44,9 +44,9 @@ describe('HTMLWriter', () => {
 
     it('Should write one and two-tag passages', () => {
       // Read HTML.
-      const fr = FileReader.read('test/HTMLWriter/TestTags.html');
+      const fr = FileReader.read('test/Twine2HTMLWriter/TestTags.html');
       // Parse HTML.
-      const story = HTMLParser.parse(fr);
+      const story = Twine2HTMLParser.parse(fr);
 
       // Read StoryFormat.
       const fr2 = FileReader.read('test/StoryFormatParser/format.js');
@@ -54,12 +54,12 @@ describe('HTMLWriter', () => {
       const storyFormat = StoryFormatParser.parse(fr2);
 
       // Write HTML.
-      HTMLWriter.write('test/HTMLWriter/test3.html', story, storyFormat);
+      Twine2HTMLWriter.write('test/Twine2HTMLWriter/test3.html', story, storyFormat);
 
       // Read HTML.
-      const fr3 = FileReader.read('test/HTMLWriter/test3.html');
+      const fr3 = FileReader.read('test/Twine2HTMLWriter/test3.html');
       // Parse HTML.
-      const story2 = HTMLParser.parse(fr3);
+      const story2 = Twine2HTMLParser.parse(fr3);
 
       let tags = '';
       let tags2 = '';
@@ -81,9 +81,9 @@ describe('HTMLWriter', () => {
 
     it('Should throw error if file path invalid', () => {
       // Read HTML.
-      const fr = FileReader.read('test/HTMLParser/twineExample3.html');
+      const fr = FileReader.read('test/Twine2HTMLParser/twineExample3.html');
       // Parse HTML.
-      const story = HTMLParser.parse(fr);
+      const story = Twine2HTMLParser.parse(fr);
 
       // Read StoryFormat.
       const fr2 = FileReader.read('test/StoryFormatParser/format.js');
@@ -92,7 +92,7 @@ describe('HTMLWriter', () => {
 
       // Throw error if path is invalid.
       expect(() => {
-        HTMLWriter.write('test2/HTMLWriter/test2.html', story, storyFormat);
+        Twine2HTMLWriter.write('test2/Twine2HTMLWriter/test2.html', story, storyFormat);
       }).toThrow();
     });
 
@@ -115,12 +115,12 @@ describe('HTMLWriter', () => {
 
       // Write out HTML with story and storyFormat.
       // (Will add position to passages without them.)
-      HTMLWriter.write('test/HTMLWriter/test4.html', story, storyFormat);
+      Twine2HTMLWriter.write('test/Twine2HTMLWriter/test4.html', story, storyFormat);
 
       // Read new HTML file.
-      const fr3 = FileReader.read('test/HTMLWriter/test4.html');
+      const fr3 = FileReader.read('test/Twine2HTMLWriter/test4.html');
       // Parse new HTML file.
-      const story2 = HTMLParser.parse(fr3);
+      const story2 = Twine2HTMLParser.parse(fr3);
 
       // Verify none of the directly created passages have position.
       story.forEach((passage) => {
@@ -155,12 +155,12 @@ describe('HTMLWriter', () => {
       const storyFormat = StoryFormatParser.parse(fr2);
 
       // Write the HTML.
-      HTMLWriter.write('test/HTMLWriter/creator.html', story, storyFormat);
+      Twine2HTMLWriter.write('test/Twine2HTMLWriter/creator.html', story, storyFormat);
 
       // Read HTML.
-      const fr3 = FileReader.read('test/HTMLWriter/creator.html');
+      const fr3 = FileReader.read('test/Twine2HTMLWriter/creator.html');
       // Parse HTML.
-      const story2 = HTMLParser.parse(fr3);
+      const story2 = Twine2HTMLParser.parse(fr3);
 
       // Test creator (should be default)
       expect(story.creator).toBe('extwee');
@@ -185,7 +185,7 @@ describe('HTMLWriter', () => {
       const storyFormat = StoryFormatParser.parse(fr2);
 
       expect(() => {
-        HTMLWriter.write('test', story, storyFormat);
+        Twine2HTMLWriter.write('test', story, storyFormat);
       }).toThrow();
     });
 
@@ -206,7 +206,7 @@ describe('HTMLWriter', () => {
 
       // Throws error
       expect(() => {
-        HTMLWriter.write('test/HTMLWriter/test6.html', story, storyFormat);
+        Twine2HTMLWriter.write('test/Twine2HTMLWriter/test6.html', story, storyFormat);
       }).toThrow();
     });
 
@@ -229,12 +229,12 @@ describe('HTMLWriter', () => {
       const storyFormat = StoryFormatParser.parse(fr2);
 
       // Write file
-      HTMLWriter.write('test/HTMLWriter/test6.html', story, storyFormat);
+      Twine2HTMLWriter.write('test/Twine2HTMLWriter/test6.html', story, storyFormat);
 
       // Read new HTML file.
-      const fr3 = FileReader.read('test/HTMLWriter/test6.html');
+      const fr3 = FileReader.read('test/Twine2HTMLWriter/test6.html');
       // Parse new HTML file.
-      const story2 = HTMLParser.parse(fr3);
+      const story2 = Twine2HTMLParser.parse(fr3);
 
       // Should not be start
       expect(story2.start).toBe('Start');
@@ -260,28 +260,28 @@ describe('HTMLWriter', () => {
 
       // Throws error
       expect(() => {
-        HTMLWriter.write('test/HTMLWriter/test7.html', story, storyFormat);
+        Twine2HTMLWriter.write('test/Twine2HTMLWriter/test7.html', story, storyFormat);
       }).toThrow();
     });
 
     it('Should correctly replace all instances of STORY_NAME', () => {
-      const fr = FileReader.read('test/HTMLWriter/example6.twee');
+      const fr = FileReader.read('test/Twine2HTMLWriter/example6.twee');
       const story = TweeParser.parse(fr);
       const storyFormatFile = FileReader.read('test/StoryFormatParser/format_doublename.js');
       const sfp = StoryFormatParser.parse(storyFormatFile);
-      HTMLWriter.write('test/HTMLWriter/test11.html', story, sfp);
-      const frh = FileReader.read('test/HTMLWriter/test11.html');
+      Twine2HTMLWriter.write('test/Twine2HTMLWriter/test11.html', story, sfp);
+      const frh = FileReader.read('test/Twine2HTMLWriter/test11.html');
       expect(frh.indexOf('STORY_NAME')).toBe(-1);
     });
   });
 
   describe('escape()', () => {
     it('Should throw error if argument is not string', () => {
-      expect(() => { HTMLWriter.escape(1); }).toThrow();
+      expect(() => { Twine2HTMLWriter.escape(1); }).toThrow();
     });
 
     it('Should escape HTML sequences', () => {
-      expect(HTMLWriter.escape('<script>alert("Hi!");</script>')).toBe('&lt;script&gt;alert(&quot;Hi!&quot;);&lt;/script&gt;');
+      expect(Twine2HTMLWriter.escape('<script>alert("Hi!");</script>')).toBe('&lt;script&gt;alert(&quot;Hi!&quot;);&lt;/script&gt;');
     });
   });
 });
diff --git a/test/HTMLWriter/TestTags.html b/test/Twine2HTMLWriter/TestTags.html
similarity index 100%
rename from test/HTMLWriter/TestTags.html
rename to test/Twine2HTMLWriter/TestTags.html
diff --git a/test/HTMLWriter/creator.html b/test/Twine2HTMLWriter/creator.html
similarity index 99%
rename from test/HTMLWriter/creator.html
rename to test/Twine2HTMLWriter/creator.html
index 3288efdb..ddd60f35 100644
--- a/test/HTMLWriter/creator.html
+++ b/test/Twine2HTMLWriter/creator.html
@@ -9,7 +9,7 @@
 	</head>
 	<body>
 		<tw-story tags></tw-story>
-		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.2.0" ifid="EBC9A421-C266-41F8-A57F-D7A613AE9A77" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
+		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.2.0" ifid="61AFC926-50BB-4376-AB17-FB286C4C6E9E" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
 	<tw-passagedata pid="1" name="A"></tw-passagedata>
diff --git a/test/HTMLWriter/example6.twee b/test/Twine2HTMLWriter/example6.twee
similarity index 100%
rename from test/HTMLWriter/example6.twee
rename to test/Twine2HTMLWriter/example6.twee
diff --git a/test/HTMLWriter/missingStoryTitle.twee b/test/Twine2HTMLWriter/missingStoryTitle.twee
similarity index 100%
rename from test/HTMLWriter/missingStoryTitle.twee
rename to test/Twine2HTMLWriter/missingStoryTitle.twee
diff --git a/test/HTMLWriter/test11.html b/test/Twine2HTMLWriter/test11.html
similarity index 100%
rename from test/HTMLWriter/test11.html
rename to test/Twine2HTMLWriter/test11.html
diff --git a/test/HTMLWriter/test2.html b/test/Twine2HTMLWriter/test2.html
similarity index 100%
rename from test/HTMLWriter/test2.html
rename to test/Twine2HTMLWriter/test2.html
diff --git a/test/HTMLWriter/test3.html b/test/Twine2HTMLWriter/test3.html
similarity index 100%
rename from test/HTMLWriter/test3.html
rename to test/Twine2HTMLWriter/test3.html
diff --git a/test/HTMLWriter/test4.html b/test/Twine2HTMLWriter/test4.html
similarity index 99%
rename from test/HTMLWriter/test4.html
rename to test/Twine2HTMLWriter/test4.html
index 7a9846a3..3d58193e 100644
--- a/test/HTMLWriter/test4.html
+++ b/test/Twine2HTMLWriter/test4.html
@@ -9,7 +9,7 @@
 	</head>
 	<body>
 		<tw-story tags></tw-story>
-		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.2.0" ifid="697CE7FF-ECE0-4F76-8711-0F2CE0536011" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
+		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.2.0" ifid="202B8A22-A12D-4AB5-8F37-40DD13007A0E" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
 	<tw-passagedata pid="1" name="A"></tw-passagedata>
diff --git a/test/HTMLWriter/test6.html b/test/Twine2HTMLWriter/test6.html
similarity index 99%
rename from test/HTMLWriter/test6.html
rename to test/Twine2HTMLWriter/test6.html
index 1467b5f2..4cb65e8b 100644
--- a/test/HTMLWriter/test6.html
+++ b/test/Twine2HTMLWriter/test6.html
@@ -9,7 +9,7 @@
 	</head>
 	<body>
 		<tw-story tags></tw-story>
-		<tw-storydata name="Name" startnode="3" creator="extwee" creator-version="2.2.0" ifid="7322E4C7-B1CF-4054-850C-4B4434DC5E91" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
+		<tw-storydata name="Name" startnode="3" creator="extwee" creator-version="2.2.0" ifid="AC862291-2D7B-443F-9800-4F5D27980A19" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
 	<tw-passagedata pid="1" name="A"></tw-passagedata>