diff --git a/docs-tools b/docs-tools
index 0462c619d..5fc12d302 160000
--- a/docs-tools
+++ b/docs-tools
@@ -1 +1 @@
-Subproject commit 0462c619d6b8f7f5036faa5751687509d8f8fb73
+Subproject commit 5fc12d302ef48cada139ec0ec63eb53c9cf00435
diff --git a/package.json b/package.json
index 081c365b2..db143cab3 100644
--- a/package.json
+++ b/package.json
@@ -36,12 +36,8 @@
   },
   "lint-staged": {
     "*.js": [
-      "eslint --fix",
-      "prettier --write",
-      "git add"
-    ],
-    "*.{json,md,mdx}": [
-      "prettier --write",
+      "npm run format:fix",
+      "npm run lint:fix",
       "git add"
     ]
   },
diff --git a/src/components/ComponentFactory.js b/src/components/ComponentFactory.js
index 1a67dd972..ec1335271 100644
--- a/src/components/ComponentFactory.js
+++ b/src/components/ComponentFactory.js
@@ -47,27 +47,26 @@ import Subscript from './Subscript';
 import Superscript from './Superscript';
 import Image from './Image';
 import RefRole from './RefRole';
+import Target from './Target';
 
+import RoleAbbr from './Roles/Abbr';
 import RoleClass from './Roles/Class';
 import RoleDoc from './Roles/Doc';
+import RoleFile from './Roles/File';
 import RoleGUILabel from './Roles/GUILabel';
-import RoleProgram from './Roles/Program';
-import RoleRef from './Roles/Ref';
-import RoleTerm from './Roles/Term';
 
 const IGNORED_NAMES = ['default-domain', 'toctree'];
-const IGNORED_TYPES = ['comment', 'substitution_definition', 'target'];
+const IGNORED_TYPES = ['comment', 'substitution_definition'];
 
 export default class ComponentFactory extends Component {
   constructor() {
     super();
     this.roles = {
+      abbr: RoleAbbr,
       class: RoleClass,
       doc: RoleDoc,
+      file: RoleFile,
       guilabel: RoleGUILabel,
-      program: RoleProgram,
-      ref: RoleRef,
-      term: RoleTerm,
     };
     this.componentMap = {
       admonition: Admonition,
@@ -111,6 +110,7 @@ export default class ComponentFactory extends Component {
       superscript: Superscript,
       tabs: Tabs,
       'tabs-pillstrip': TabsPillstrip,
+      target: Target,
       text: Text,
       title_reference: TitleReference,
       topic: Topic,
diff --git a/src/components/DocumentBody.js b/src/components/DocumentBody.js
index 23c5f4bac..ed6ef7baf 100644
--- a/src/components/DocumentBody.js
+++ b/src/components/DocumentBody.js
@@ -3,7 +3,15 @@ import PropTypes from 'prop-types';
 import ComponentFactory from './ComponentFactory';
 import { getNestedValue } from '../utils/get-nested-value';
 
-const DocumentBody = ({ addPillstrip, footnotes, pillstrips, refDocMapping, slugTitleMapping, substitutions }) => {
+const DocumentBody = ({
+  addPillstrip,
+  footnotes,
+  pillstrips,
+  refDocMapping,
+  slug,
+  slugTitleMapping,
+  substitutions,
+}) => {
   const pageNodes = getNestedValue(['ast', 'children'], refDocMapping) || [];
   return (
     <React.Fragment>
@@ -15,6 +23,7 @@ const DocumentBody = ({ addPillstrip, footnotes, pillstrips, refDocMapping, slug
           nodeData={child}
           refDocMapping={refDocMapping}
           pillstrips={pillstrips}
+          slug={slug}
           slugTitleMapping={slugTitleMapping}
           substitutions={substitutions}
         />
@@ -32,6 +41,7 @@ DocumentBody.propTypes = {
       children: PropTypes.array,
     }).isRequired,
   }).isRequired,
+  slug: PropTypes.string.isRequired,
   slugTitleMapping: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.array, PropTypes.string])),
   substitutions: PropTypes.objectOf(PropTypes.array),
 };
diff --git a/src/components/Link.js b/src/components/Link.js
index 8c3ed76b5..ffd829fab 100644
--- a/src/components/Link.js
+++ b/src/components/Link.js
@@ -11,10 +11,13 @@ import { isPreviewMode } from '../utils/is-preview-mode';
 // Since DOM elements <a> cannot receive activeClassName and partiallyActive,
 // destructure the prop here and pass it only to GatsbyLink.
 const Link = ({ children, to, activeClassName, partiallyActive, ...other }) => {
+  if (!to) to = '';
   // Assume that external links begin with http:// or https://
   const external = /^http(s)?:\/\//.test(to);
+  const anchor = to.startsWith('#');
+
   // Use Gatsby Link for internal links, and <a> for others
-  if (!isPreviewMode() && to && !external) {
+  if (!isPreviewMode() && to && !external && !anchor) {
     if (!to.startsWith('/')) to = `/${to}`;
     return (
       <GatsbyLink to={to} activeClassName={activeClassName} partiallyActive={partiallyActive} {...other}>
diff --git a/src/components/RefRole.js b/src/components/RefRole.js
index 1f8d09d2b..f4ac5d464 100644
--- a/src/components/RefRole.js
+++ b/src/components/RefRole.js
@@ -1,6 +1,43 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+import ComponentFactory from './ComponentFactory';
+import Link from './Link';
 
-// TODO: Properly render ref_role nodes with links and labels
-const RefRole = () => <span>RefRole</span>;
+const RefRole = ({ nodeData: { children, domain, fileid, name, target, url }, slug }) => {
+  // Render intersphinx target links
+  if (url) {
+    return (
+      <Link to={url} className="reference external">
+        {children.map((node, i) => (
+          <ComponentFactory key={i} nodeData={node} />
+        ))}
+      </Link>
+    );
+  }
+
+  // Render internal target links
+  const link = fileid === slug ? `#${target}` : `${fileid}#${target}`;
+  return (
+    <Link to={link} className="reference internal">
+      <span className={`${domain} ${domain}-ref`}>
+        {children.map((node, i) => (
+          <ComponentFactory key={i} nodeData={node} />
+        ))}
+      </span>
+    </Link>
+  );
+};
+
+RefRole.propTypes = {
+  nodeData: PropTypes.shape({
+    children: PropTypes.arrayOf(PropTypes.node).isRequired,
+    domain: PropTypes.string.isRequired,
+    fileid: PropTypes.string,
+    name: PropTypes.string.isRequired,
+    target: PropTypes.string.isRequired,
+    url: PropTypes.string,
+  }).isRequired,
+  slug: PropTypes.string.isRequired,
+};
 
 export default RefRole;
diff --git a/src/components/Reference.js b/src/components/Reference.js
index d516b2cb5..2ab3530b8 100644
--- a/src/components/Reference.js
+++ b/src/components/Reference.js
@@ -1,22 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import ComponentFactory from './ComponentFactory';
 import Link from './Link';
-import { getNestedValue } from '../utils/get-nested-value';
 
-const Reference = ({ nodeData }) => (
-  <Link className="reference external" to={nodeData.refuri}>
-    {getNestedValue(['children', 0, 'value'], nodeData)}
-  </Link>
-);
+const Reference = ({ nodeData }) => {
+  return (
+    <Link className="reference external" to={nodeData.refuri}>
+      {nodeData.children.map((element, index) => (
+        <ComponentFactory key={index} nodeData={element} />
+      ))}
+    </Link>
+  );
+};
 
 Reference.propTypes = {
   nodeData: PropTypes.shape({
-    children: PropTypes.arrayOf(
-      PropTypes.shape({
-        type: PropTypes.string.isRequired,
-        value: PropTypes.string,
-      })
-    ).isRequired,
+    children: PropTypes.array.isRequired,
     refuri: PropTypes.string.isRequired,
   }).isRequired,
 };
diff --git a/src/components/Roles/Abbr.js b/src/components/Roles/Abbr.js
new file mode 100644
index 000000000..089960ac8
--- /dev/null
+++ b/src/components/Roles/Abbr.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Abbr = ({
+  nodeData: {
+    children: [{ value }],
+  },
+}) => {
+  if (!value) {
+    return null;
+  }
+
+  // Abbreviations appear as "ABBR (Full Name Here)", so separate this into `abbr` and `expansion`
+  let [abbr, expansion] = value.split('(');
+  expansion = expansion.split(')')[0];
+  return <abbr title={expansion}>{abbr}</abbr>;
+};
+
+Abbr.propTypes = {
+  nodeData: PropTypes.shape({
+    children: PropTypes.arrayOf(
+      PropTypes.shape({
+        value: PropTypes.string.isRequired,
+      })
+    ).isRequired,
+  }).isRequired,
+};
+
+export default Abbr;
diff --git a/src/components/Roles/Api.js b/src/components/Roles/Api.js
deleted file mode 100644
index a51719a79..000000000
--- a/src/components/Roles/Api.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const RoleApi = ({
-  nodeData: {
-    label: { value },
-    name,
-    target,
-  },
-}) => {
-  let href;
-  if (name === 'java-sync-api') {
-    href = `http://mongodb.github.io/mongo-java-driver/3.7/javadoc/${target}`;
-  } else if (name === 'csharp-api') {
-    href = `https://mongodb.github.io/mongo-csharp-driver/2.5/apidocs/html/${target}.htm`;
-  }
-
-  return (
-    <a href={href} className="reference external">
-      {value}
-    </a>
-  );
-};
-
-RoleApi.propTypes = {
-  nodeData: PropTypes.shape({
-    label: PropTypes.shape({
-      value: PropTypes.string.isRequired,
-    }).isRequired,
-    name: PropTypes.oneOf(['java-sync-api', 'csharp-api']).isRequired,
-    target: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default RoleApi;
diff --git a/src/components/Roles/Class.js b/src/components/Roles/Class.js
index 6ca0ddfd8..b0b311d36 100644
--- a/src/components/Roles/Class.js
+++ b/src/components/Roles/Class.js
@@ -1,25 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { getNestedValue } from '../../utils/get-nested-value';
+import ComponentFactory from '../ComponentFactory';
 
-const baseUrl = 'https://api.mongodb.com/python/current/api/pymongo/results.html#';
-const RoleClass = ({ nodeData: { label, target } }) => {
-  const labelDisplay = getNestedValue(['value'], label) || target;
-  return (
-    <a href={`${baseUrl}${target}`} className="reference external">
-      <code className="xref py py-class docutils literal notranslate">
-        <span className="pre">{labelDisplay}</span>
-      </code>
-    </a>
-  );
-};
+const RoleClass = ({ nodeData: { children, target } }) => (
+  <a href={`${target}`} className="reference external">
+    {children.map((node, i) => (
+      <ComponentFactory key={i} nodeData={node} />
+    ))}
+  </a>
+);
 
 RoleClass.propTypes = {
   nodeData: PropTypes.shape({
-    label: PropTypes.shape({
-      value: PropTypes.string,
-    }),
-    target: PropTypes.string.isRequired,
+    children: PropTypes.arrayOf(PropTypes.node).isRequired,
   }).isRequired,
 };
 
diff --git a/src/components/Roles/Doc.js b/src/components/Roles/Doc.js
index 23a7a2f59..705087d39 100644
--- a/src/components/Roles/Doc.js
+++ b/src/components/Roles/Doc.js
@@ -4,13 +4,10 @@ import { formatText } from '../../utils/format-text';
 import { getNestedValue } from '../../utils/get-nested-value';
 import Link from '../Link';
 
-const RoleDoc = ({ nodeData: { label, target }, slugTitleMapping }) => {
-  let labelDisplay = getNestedValue(['value'], label);
-  if (!labelDisplay) {
-    const key = target.startsWith('/') ? target.slice(1) : target;
-    const text = getNestedValue([key], slugTitleMapping);
-    labelDisplay = text ? formatText(slugTitleMapping[key]) : target;
-  }
+const RoleDoc = ({ nodeData: { target }, slugTitleMapping }) => {
+  const key = target.startsWith('/') ? target.slice(1) : target;
+  const text = getNestedValue([key], slugTitleMapping);
+  const labelDisplay = text ? formatText(slugTitleMapping[key]) : target;
 
   return (
     <Link to={target} className="reference internal">
diff --git a/src/components/Roles/File.js b/src/components/Roles/File.js
new file mode 100644
index 000000000..274f1098a
--- /dev/null
+++ b/src/components/Roles/File.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ComponentFactory from '../ComponentFactory';
+
+const RoleFile = ({ nodeData: { children } }) => (
+  <code className="file docutils literal">
+    <span className="pre">
+      {children.map((node, i) => (
+        <ComponentFactory key={i} nodeData={node} />
+      ))}
+    </span>
+  </code>
+);
+
+RoleFile.propTypes = {
+  nodeData: PropTypes.shape({
+    children: PropTypes.arrayOf(PropTypes.node).isRequired,
+  }).isRequired,
+};
+
+export default RoleFile;
diff --git a/src/components/Roles/GUILabel.js b/src/components/Roles/GUILabel.js
index 180310188..8c8da50b5 100644
--- a/src/components/Roles/GUILabel.js
+++ b/src/components/Roles/GUILabel.js
@@ -1,17 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import ComponentFactory from '../ComponentFactory';
 
-const RoleGUILabel = ({
-  nodeData: {
-    label: { value },
-  },
-}) => <span className="guilabel">{value}</span>;
+const RoleGUILabel = ({ nodeData: { children } }) => (
+  <span className="guilabel">
+    {children.map((node, i) => (
+      <ComponentFactory key={i} nodeData={node} />
+    ))}
+  </span>
+);
 
 RoleGUILabel.propTypes = {
   nodeData: PropTypes.shape({
-    label: PropTypes.shape({
-      value: PropTypes.string.isRequired,
-    }).isRequired,
+    children: PropTypes.array.isRequired,
   }).isRequired,
 };
 
diff --git a/src/components/Roles/Manual.js b/src/components/Roles/Manual.js
index fe845189c..41f362635 100644
--- a/src/components/Roles/Manual.js
+++ b/src/components/Roles/Manual.js
@@ -1,23 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import ComponentFactory from '../ComponentFactory';
 import { REF_TARGETS } from '../../constants';
-import { getNestedValue } from '../../utils/get-nested-value';
 
-const RoleManual = ({ nodeData: { label, target } }) => {
-  const labelDisplay = getNestedValue(['value'], label) || target;
+const RoleManual = ({ nodeData: { children, target } }) => {
   return (
     <a href={`${REF_TARGETS.manual}${target.replace('/manual', '')}`} className="reference external">
-      {labelDisplay}
+      {children.map((node, i) => (
+        <ComponentFactory key={i} nodeData={node} />
+      ))}
     </a>
   );
 };
 
 RoleManual.propTypes = {
   nodeData: PropTypes.shape({
-    label: PropTypes.shape({
-      value: PropTypes.string,
-    }),
-    target: PropTypes.string.isRequired,
+    children: PropTypes.arrayOf(PropTypes.node).isRequired,
   }).isRequired,
 };
 
diff --git a/src/components/Roles/Program.js b/src/components/Roles/Program.js
deleted file mode 100644
index e5b904028..000000000
--- a/src/components/Roles/Program.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { getNestedValue } from '../../utils/get-nested-value';
-
-const RoleProgram = ({ nodeData: { label, target } }) => {
-  const labelDisplay = getNestedValue(['value'], label) || target;
-  return <strong className="program">{labelDisplay}</strong>;
-};
-
-RoleProgram.propTypes = {
-  nodeData: PropTypes.shape({
-    label: PropTypes.shape({
-      value: PropTypes.string,
-    }),
-    target: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default RoleProgram;
diff --git a/src/components/Roles/Ref.js b/src/components/Roles/Ref.js
deleted file mode 100644
index 9806b2e71..000000000
--- a/src/components/Roles/Ref.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { REF_LABELS, REF_TARGETS } from '../../constants';
-import { getNestedValue } from '../../utils/get-nested-value';
-
-const RoleRef = ({ nodeData: { label, target } }) => {
-  let labelDisplay;
-  if (label) {
-    labelDisplay = getNestedValue(['value'], label) || target;
-  } else {
-    labelDisplay = REF_LABELS[target] || target;
-  }
-  // make sure target is hardcoded in list for now
-  // TODO: chat w andrew about how to move forward with sphinx inventory files
-  if (!REF_TARGETS[target]) {
-    console.error(`ERROR: ROLE TARGET DOES NOT EXIST => ${target}`);
-    return '';
-  }
-  return (
-    <a href={REF_TARGETS[target]} className="reference external">
-      <span className="xref std std-ref">{labelDisplay}</span>
-    </a>
-  );
-};
-
-RoleRef.propTypes = {
-  nodeData: PropTypes.shape({
-    label: PropTypes.shape({
-      value: PropTypes.string,
-    }),
-    target: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default RoleRef;
diff --git a/src/components/Roles/Term.js b/src/components/Roles/Term.js
deleted file mode 100644
index c82276262..000000000
--- a/src/components/Roles/Term.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { REF_TARGETS } from '../../constants';
-import { getNestedValue } from '../../utils/get-nested-value';
-
-const RoleTerm = ({ nodeData: { label, target } }) => {
-  const labelDisplay = getNestedValue(['value'], label) || target;
-  return (
-    <a href={`${REF_TARGETS.glossary}/#term-${target}`} className="reference external">
-      {labelDisplay}
-    </a>
-  );
-};
-
-RoleTerm.propTypes = {
-  nodeData: PropTypes.shape({
-    label: PropTypes.shape({
-      value: PropTypes.string,
-    }),
-    target: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-export default RoleTerm;
diff --git a/src/components/Target.js b/src/components/Target.js
new file mode 100644
index 000000000..a5844a49d
--- /dev/null
+++ b/src/components/Target.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ComponentFactory from './ComponentFactory';
+
+const Target = ({ nodeData: { children, name, target } }) => {
+  // Identify special child nodes (target_ref_title and directive_argument) and render properly.
+  // Render the remaining children nodes as standard children.
+  const childNodes = [];
+  let targetRefTitle,
+    directiveArgument = null;
+  children.forEach(node => {
+    if (node.type === 'target_ref_title') {
+      targetRefTitle = <span id={target} />;
+    } else if (node.type === 'directive_argument') {
+      directiveArgument = (
+        <dt id={target}>
+          {node.children.map((child, j) => (
+            <ComponentFactory key={j} nodeData={child} />
+          ))}
+          <a href={`#${target}`} className="headerlink" title="Permalink to this definition">
+            ¶
+          </a>
+        </dt>
+      );
+    } else {
+      childNodes.push(node);
+    }
+  });
+
+  const renderDictList = directiveArgument || childNodes.length > 0;
+  return (
+    <React.Fragment>
+      {targetRefTitle}
+      {renderDictList && (
+        <dl className={name}>
+          {directiveArgument}
+          {childNodes.length > 0 && (
+            <dd>
+              {children.map((node, i) => (
+                <ComponentFactory nodeData={node} key={i} />
+              ))}
+            </dd>
+          )}
+        </dl>
+      )}
+    </React.Fragment>
+  );
+};
+
+Target.propTypes = {
+  nodeData: PropTypes.shape({
+    children: PropTypes.arrayOf(PropTypes.node).isRequired,
+    name: PropTypes.string.isRequired,
+    target: PropTypes.string.isRequired,
+  }).isRequired,
+};
+
+export default Target;
diff --git a/src/components/VersionDropdown.js b/src/components/VersionDropdown.js
index a0dfafbf9..39e4a2b33 100644
--- a/src/components/VersionDropdown.js
+++ b/src/components/VersionDropdown.js
@@ -67,7 +67,7 @@ const VersionDropdown = ({
         title="Select version"
       >
         {prefixVersion(currentBranch)}
-        <span class="caret"></span>
+        <span className="caret"></span>
       </button>
       {!hidden && (
         <ul className={['dropdown-menu', dropdownStyles.menu].join(' ')} role="menu">
diff --git a/src/templates/document.js b/src/templates/document.js
index 6a333a3a6..0923272c2 100644
--- a/src/templates/document.js
+++ b/src/templates/document.js
@@ -34,7 +34,12 @@ const Document = props => {
               <div className="bodywrapper">
                 <div className="body">
                   <Breadcrumbs parentPaths={getNestedValue([slug], parentPaths)} slugTitleMapping={slugTitleMapping} />
-                  <DocumentBody refDocMapping={__refDocMapping} slugTitleMapping={slugTitleMapping} {...rest} />
+                  <DocumentBody
+                    refDocMapping={__refDocMapping}
+                    slug={slug}
+                    slugTitleMapping={slugTitleMapping}
+                    {...rest}
+                  />
                   <InternalPageNav slug={slug} slugTitleMapping={slugTitleMapping} toctreeOrder={toctreeOrder} />
                   <Footer />
                 </div>
diff --git a/src/templates/guide.js b/src/templates/guide.js
index 4dc973310..8cea3753e 100644
--- a/src/templates/guide.js
+++ b/src/templates/guide.js
@@ -136,6 +136,7 @@ export default class Guide extends Component {
           refDocMapping={getNestedValue(['__refDocMapping'], pageContext) || {}}
           addTabset={this.addGuidesTabset}
           pillstrips={pillstrips}
+          slugTitleMapping={pageContext.slugTitleMapping}
         />
       );
     });
@@ -187,6 +188,9 @@ Guide.propTypes = {
         children: PropTypes.array,
       }).isRequired,
     }).isRequired,
+    slugTitleMapping: PropTypes.shape({
+      [PropTypes.string]: PropTypes.string,
+    }),
     snootyStitchId: PropTypes.string.isRequired,
   }).isRequired,
   path: PropTypes.string.isRequired,
diff --git a/tests/unit/Role.test.js b/tests/unit/Role.test.js
index 8ded7b634..ec43e0806 100644
--- a/tests/unit/Role.test.js
+++ b/tests/unit/Role.test.js
@@ -1,52 +1,26 @@
 import React from 'react';
-import { shallow, render } from 'enzyme';
+import { render } from 'enzyme';
 
 import RoleDoc from '../../src/components/Roles/Doc';
 import RoleGUILabel from '../../src/components/Roles/GUILabel';
-import RoleManual from '../../src/components/Roles/Manual';
-import RoleProgram from '../../src/components/Roles/Program';
-import RoleRef from '../../src/components/Roles/Ref';
-import RoleTerm from '../../src/components/Roles/Term';
+import RoleFile from '../../src/components/Roles/File';
 
 import mockDataDoc from './data/Role-doc.test.json';
-import mockDataDocUnlabeled from './data/Role-doc-unlabeled.test.json';
 import mockDataGUILabel from './data/Role-guilabel.test.json';
-import mockDataManual from './data/Role-manual.test.json';
-import mockDataProgram from './data/Role-program.test.json';
-import mockDataRef from './data/Role-ref.test.json';
-import mockDataTerm from './data/Role-term.test.json';
+import mockDataFile from './data/Role-file.test.json';
+import slugTitleMapping from './data/ecosystem/slugTitleMapping.json';
 
-it('renders correctly role "doc"', () => {
-  const tree = render(<RoleDoc nodeData={mockDataDoc} />);
+it('correctly renders a "doc" role', () => {
+  const tree = render(<RoleDoc nodeData={mockDataDoc} slugTitleMapping={slugTitleMapping} />);
   expect(tree).toMatchSnapshot();
 });
 
-it('renders correctly role "doc" when no link title is included', () => {
-  const tree = render(<RoleDoc nodeData={mockDataDocUnlabeled} />);
+it('correctly renders a "guilabel" role', () => {
+  const tree = render(<RoleGUILabel nodeData={mockDataGUILabel} />);
   expect(tree).toMatchSnapshot();
 });
 
-it('renders correctly a role "guilabel"', () => {
-  const tree = shallow(<RoleGUILabel nodeData={mockDataGUILabel} />);
-  expect(tree).toMatchSnapshot();
-});
-
-it('renders correctly role "manual"', () => {
-  const tree = shallow(<RoleManual nodeData={mockDataManual} />);
-  expect(tree).toMatchSnapshot();
-});
-
-it('renders correctly role "program"', () => {
-  const tree = shallow(<RoleProgram nodeData={mockDataProgram} />);
-  expect(tree).toMatchSnapshot();
-});
-
-it('renders correctly role "ref"', () => {
-  const tree = shallow(<RoleRef nodeData={mockDataRef} />);
-  expect(tree).toMatchSnapshot();
-});
-
-it('renders correctly role "term"', () => {
-  const tree = shallow(<RoleTerm nodeData={mockDataTerm} />);
+it('correctly renders a "file" role', () => {
+  const tree = render(<RoleFile nodeData={mockDataFile} />);
   expect(tree).toMatchSnapshot();
 });
diff --git a/tests/unit/__snapshots__/Role.test.js.snap b/tests/unit/__snapshots__/Role.test.js.snap
index 1754ef71d..3d8cbb080 100644
--- a/tests/unit/__snapshots__/Role.test.js.snap
+++ b/tests/unit/__snapshots__/Role.test.js.snap
@@ -1,66 +1,30 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`renders correctly a role "guilabel" 1`] = `
-<span
-  className="guilabel"
->
-  Yes
-</span>
-`;
-
-exports[`renders correctly role "doc" 1`] = `
-<a
-  class="reference internal"
-  href="/cloud/atlas"
->
-  Create an Atlas Account and Cluster
-</a>
-`;
-
-exports[`renders correctly role "doc" when no link title is included 1`] = `
+exports[`correctly renders a "doc" role 1`] = `
 <a
   class="reference internal"
-  href="/server/drivers"
+  href="/use-cases/product-catalog"
 >
-  /server/drivers
+  Product Catalog
 </a>
 `;
 
-exports[`renders correctly role "manual" 1`] = `
-<a
-  className="reference external"
-  href="https://docs.mongodb.com/manual/introduction"
->
-  The MongoDB Server Manual
-</a>
-`;
-
-exports[`renders correctly role "program" 1`] = `
-<strong
-  className="program"
->
-  mongoimport
-</strong>
-`;
-
-exports[`renders correctly role "ref" 1`] = `
-<a
-  className="reference external"
-  href="https://docs.mongodb.com/manual/installation/#mongodb-supported-platforms"
+exports[`correctly renders a "file" role 1`] = `
+<code
+  class="file docutils literal"
 >
   <span
-    className="xref std std-ref"
+    class="pre"
   >
-    Supported Platforms
+    examples/treasury_yield/src/main/resources/yield_historical_in.json
   </span>
-</a>
+</code>
 `;
 
-exports[`renders correctly role "term" 1`] = `
-<a
-  className="reference external"
-  href="https://docs.mongodb.com/manual/reference/glossary/#term-dbpath"
+exports[`correctly renders a "guilabel" role 1`] = `
+<span
+  class="guilabel"
 >
-  data directory
-</a>
+  Yes
+</span>
 `;
diff --git a/tests/unit/data/Role-authrole.test.json b/tests/unit/data/Role-authrole.test.json
deleted file mode 100644
index 9d51be3b0..000000000
--- a/tests/unit/data/Role-authrole.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 0
-    }
-  },
-  "name": "authrole",
-  "target": "clusterMonitor",
-  "children": []
-}
diff --git a/tests/unit/data/Role-binary.test.json b/tests/unit/data/Role-binary.test.json
deleted file mode 100644
index 91a570599..000000000
--- a/tests/unit/data/Role-binary.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 16
-    }
-  },
-  "name": "binary",
-  "target": "~bin.mongod.exe",
-  "children": []
-}
diff --git a/tests/unit/data/Role-doc-unlabeled.test.json b/tests/unit/data/Role-doc-unlabeled.test.json
deleted file mode 100644
index c802f626c..000000000
--- a/tests/unit/data/Role-doc-unlabeled.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 25
-    }
-  },
-  "name": "doc",
-  "target": "/server/drivers",
-  "children": []
-}
diff --git a/tests/unit/data/Role-doc.test.json b/tests/unit/data/Role-doc.test.json
index d69d14958..abdbc7171 100644
--- a/tests/unit/data/Role-doc.test.json
+++ b/tests/unit/data/Role-doc.test.json
@@ -2,19 +2,13 @@
   "type": "role",
   "position": {
     "start": {
-      "line": 37
-    }
-  },
-  "name": "doc",
-  "label": {
-    "type": "text",
-    "value": "Create an Atlas Account and Cluster",
-    "position": {
-      "start": {
-        "line": 36
+      "line": {
+        "$numberInt": "19"
       }
     }
   },
-  "target": "/cloud/atlas",
+  "domain": "",
+  "name": "doc",
+  "target": "/use-cases/product-catalog",
   "children": []
 }
diff --git a/tests/unit/data/Role-file.test.json b/tests/unit/data/Role-file.test.json
new file mode 100644
index 000000000..cf12a651f
--- /dev/null
+++ b/tests/unit/data/Role-file.test.json
@@ -0,0 +1,25 @@
+{
+  "type": "role",
+  "position": {
+    "start": {
+      "line": {
+        "$numberInt": "101"
+      }
+    }
+  },
+  "domain": "",
+  "name": "file",
+  "children": [
+    {
+      "type": "text",
+      "position": {
+        "start": {
+          "line": {
+            "$numberInt": "101"
+          }
+        }
+      },
+      "value": "examples/treasury_yield/src/main/resources/yield_historical_in.json"
+    }
+  ]
+}
diff --git a/tests/unit/data/Role-guilabel.test.json b/tests/unit/data/Role-guilabel.test.json
index 033ce269a..f7d92786e 100644
--- a/tests/unit/data/Role-guilabel.test.json
+++ b/tests/unit/data/Role-guilabel.test.json
@@ -1,13 +1,25 @@
 {
-  "name": "guilabel",
-  "label": {
-    "type": "text",
-    "value": "Yes",
-    "position": {
-      "start": {
-        "line": 13
+  "type": "role",
+  "position": {
+    "start": {
+      "line": {
+        "$numberInt": "8"
       }
     }
   },
-  "children": []
+  "domain": "",
+  "name": "guilabel",
+  "children": [
+    {
+      "type": "text",
+      "position": {
+        "start": {
+          "line": {
+            "$numberInt": "8"
+          }
+        }
+      },
+      "value": "Yes"
+    }
+  ]
 }
diff --git a/tests/unit/data/Role-manual.test.json b/tests/unit/data/Role-manual.test.json
deleted file mode 100644
index d3634a1c0..000000000
--- a/tests/unit/data/Role-manual.test.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 0
-    }
-  },
-  "name": "manual",
-  "label": {
-    "type": "text",
-    "value": "The MongoDB Server Manual",
-    "position": {
-      "start": {
-        "line": 1
-      }
-    }
-  },
-  "target": "/manual/introduction",
-  "raw": "The MongoDB Server Manual </manual/introduction>",
-  "children": []
-}
\ No newline at end of file
diff --git a/tests/unit/data/Role-method.test.json b/tests/unit/data/Role-method.test.json
deleted file mode 100644
index 3964b5a66..000000000
--- a/tests/unit/data/Role-method.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 1
-    }
-  },
-  "name": "method",
-  "target": "ObjectId",
-  "children": []
-}
diff --git a/tests/unit/data/Role-option.test.json b/tests/unit/data/Role-option.test.json
deleted file mode 100644
index 104606e3a..000000000
--- a/tests/unit/data/Role-option.test.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 5
-    }
-  },
-  "name": "option",
-  "label": {
-    "type": "text",
-    "value": "--file",
-    "position": {
-      "start": {
-        "line": 6
-      }
-    }
-  },
-  "target": "mongoimport.--file",
-  "children": []
-}
diff --git a/tests/unit/data/Role-program.test.json b/tests/unit/data/Role-program.test.json
deleted file mode 100644
index 4597963fc..000000000
--- a/tests/unit/data/Role-program.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 2
-    }
-  },
-  "name": "program",
-  "target": "mongoimport",
-  "children": []
-}
diff --git a/tests/unit/data/Role-query.test.json b/tests/unit/data/Role-query.test.json
deleted file mode 100644
index 10e79362d..000000000
--- a/tests/unit/data/Role-query.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 5
-    }
-  },
-  "name": "query",
-  "target": "$lt",
-  "children": []
-}
diff --git a/tests/unit/data/Role-ref.test.json b/tests/unit/data/Role-ref.test.json
deleted file mode 100644
index 170d5c4b1..000000000
--- a/tests/unit/data/Role-ref.test.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 43
-    }
-  },
-  "name": "ref",
-  "label": {
-    "type": "text",
-    "value": "Supported Platforms",
-    "position": {
-      "start": {
-        "line": 40
-      }
-    }
-  },
-  "target": "mongodb-supported-platforms",
-  "raw": "Supported Platforms <mongodb-supported-platforms>",
-  "children": []
-}
\ No newline at end of file
diff --git a/tests/unit/data/Role-setting.test.json b/tests/unit/data/Role-setting.test.json
deleted file mode 100644
index 21aff4ca5..000000000
--- a/tests/unit/data/Role-setting.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 0
-    }
-  },
-  "name": "setting",
-  "target": "dbpath",
-  "children": []
-}
diff --git a/tests/unit/data/Role-term.test.json b/tests/unit/data/Role-term.test.json
deleted file mode 100644
index debf54e0d..000000000
--- a/tests/unit/data/Role-term.test.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 6
-    }
-  },
-  "name": "term",
-  "label": {
-    "type": "text",
-    "value": "data directory",
-    "position": {
-      "start": {
-        "line": 7
-      }
-    }
-  },
-  "target": "dbpath",
-  "raw": "data directory <dbpath>",
-  "children": []
-}
\ No newline at end of file
diff --git a/tests/unit/data/Role-update.test.json b/tests/unit/data/Role-update.test.json
deleted file mode 100644
index 63a8f9673..000000000
--- a/tests/unit/data/Role-update.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "type": "role",
-  "position": {
-    "start": {
-      "line": 0
-    }
-  },
-  "name": "update",
-  "target": "~up.$set",
-  "children": []
-}