diff --git a/app/partials/mms/pane-left.html b/app/partials/mms/pane-left.html
index f3c3f9686..2357358f0 100644
--- a/app/partials/mms/pane-left.html
+++ b/app/partials/mms/pane-left.html
@@ -27,7 +27,7 @@ <h4 style="margin: 3px 0px 3px 10px;">List of {{view.title}}</h4>
                             <i ng-class="{'active-text': row.branch.selected}"
                             class="indented tree-icon fa {{view.icon}}"></i>
                             <!-- TODO active branch -->
-                            <span class="indented tree-label" ng-class="{'active-text': row.branch.selected}">{{row.data._veNumber}} {{row.data.name}}</span>
+                            <span class="indented tree-label" ng-class="{'active-text': row.branch.selected}">{{row.data._veNumber}} <span ng-bind-html="row.data.name"></span></span>
                         </a>
                     </div>
                 </li>
diff --git a/src/directives/mmsTranscludeName.js b/src/directives/mmsTranscludeName.js
index 8ce83ddc7..ef4c16964 100644
--- a/src/directives/mmsTranscludeName.js
+++ b/src/directives/mmsTranscludeName.js
@@ -31,7 +31,7 @@ angular.module('mms.directives')
 function mmsTranscludeName(ElementService, UxService, $compile, growl, $templateCache, Utils, ViewService) {
 
     var template = $templateCache.get('mms/templates/mmsTranscludeName.html');
-    var defaultTemplate = '<span ng-if="element.name">{{element.name}}</span><span ng-if="!element.name" class="no-print placeholder">(no name)</span>';
+    var defaultTemplate = '<span ng-if="element.name" ng-bind-html="element.name"></span><span ng-if="!element.name" class="no-print placeholder">(no name)</span>';
     var editTemplate = '<span ng-if="edit.name">{{edit.name}}</span><span ng-if="!edit.name" class="no-print placeholder">(no name)</span>';
 
     var mmsTranscludeNameLink = function(scope, domElement, attrs, controllers) {
diff --git a/src/directives/mmsViewImg.js b/src/directives/mmsViewImg.js
index 975c86366..5616ed782 100644
--- a/src/directives/mmsViewImg.js
+++ b/src/directives/mmsViewImg.js
@@ -4,7 +4,7 @@ angular.module('mms.directives')
 .directive('mmsViewImg', [mmsViewImg]);
 
 function mmsViewImg() {
-    var template = '<figure><mms-cf mms-cf-type="img" mms-element-id="{{image.id}}"></mms-cf><figcaption><span ng-if="!image.excludeFromList">Figure {{mmsPe._veNumber}}. </span>{{image.title || mmsPe.name}}</figcaption></figure>';
+    var template = '<figure><mms-cf mms-cf-type="img" mms-element-id="{{image.id}}"></mms-cf><figcaption><span ng-if="!image.excludeFromList">Figure {{mmsPe._veNumber}}. </span><span ng-bind-html="image.title || mmsPe.name"></span></figcaption></figure>';
     return {
         restrict: 'E',
         template: template,
diff --git a/src/directives/mmsViewLink.js b/src/directives/mmsViewLink.js
index d6fc18f64..e41fda11a 100644
--- a/src/directives/mmsViewLink.js
+++ b/src/directives/mmsViewLink.js
@@ -149,7 +149,7 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
             suppressNumbering: '<'
         },
         require: ['?^^mmsCf', '?^^mmsView'],
-        template: '<span ng-if="!loading"><a target="{{target}}" ng-class="linkClass" ng-href="{{href}}"><i ng-class="linkIconClass" aria-hidden="true"></i><span ng-if="linkText">{{linkText}}</span><span ng-if="!linkText && change">{{type}}{{element._veNumber}}{{suffix}}</span><span ng-if="!linkText && !change">{{name || "Unnamed View"}}</span></a>' +
+        template: '<span ng-if="!loading"><a target="{{target}}" ng-class="linkClass" ng-href="{{href}}"><i ng-class="linkIconClass" aria-hidden="true"></i><span ng-if="linkText">{{linkText}}</span><span ng-if="!linkText && change">{{type}}{{element._veNumber}}{{suffix}}</span><span ng-if="!linkText && !change" ng-bind-html="name"></span></a>' +
         '<a class="external-link no-print" target="_blank" ng-href="{{href}}" ng-if="mmsExternalLink"><i class="fa fa-external-link" aria-hidden="true" title="Open document in new tab"></i></a></span>',
         link: mmsViewLinkLink
     };
diff --git a/src/directives/templates/mmsSpec.html b/src/directives/templates/mmsSpec.html
index e0d0442ff..2bfdfd53b 100644
--- a/src/directives/templates/mmsSpec.html
+++ b/src/directives/templates/mmsSpec.html
@@ -101,7 +101,7 @@ <h2 class="prop-title">Commit</h2>
         <div class="text-warning" ng-if="mmsDisplayOldContent">
             <b> Element not found:</b> displaying last found content
         </div>
-        <h1 class="prop element-title" ng-class="{'mms-error': mmsDisplayOldContent}"><span class="{{ elementTypeClass }}"></span>{{element.name}}</h1>
+        <h1 class="prop element-title" ng-class="{'mms-error': mmsDisplayOldContent}"><span class="{{ elementTypeClass }}"></span><span ng-bind-html="element.name"></span></h1>
         <span class="elem-updated-wrapper">Last modified {{element._modified | date:'M/d/yy h:mm a'}} by <b>{{element._modifier}}</b></span>
 
         <div ng-if="element.type === 'Property' || element.type === 'Port' || element.type === 'Slot'">
diff --git a/src/directives/templates/mmsTree.html b/src/directives/templates/mmsTree.html
index 10e86a36d..8affd2a49 100644
--- a/src/directives/templates/mmsTree.html
+++ b/src/directives/templates/mmsTree.html
@@ -6,7 +6,7 @@
                 <a ng-href="{{getHref(row);}}" class="tree-item">
                     <i ng-class="{'active-text': row.branch.selected}" ng-click="expandCallback(row, $event)" class="indented tree-icon {{row.expand_icon}}" ></i>
                     <i ng-class="{'active-text': row.branch.selected}" class="indented tree-icon {{row.type_icon}}" ></i>
-                    <span class="indented tree-label" ng-class="{'active-text': row.branch.selected}">{{row.section}} {{row.branch.data.name}}</span>
+                    <span class="indented tree-label" ng-class="{'active-text': row.branch.selected}">{{row.section}} <span ng-bind-html="row.branch.data.name"></span></span>
                 </a>
             </div>
         </div>
diff --git a/src/directives/templates/mmsViewSection.html b/src/directives/templates/mmsViewSection.html
index 3afe58db1..8a20df226 100644
--- a/src/directives/templates/mmsViewSection.html
+++ b/src/directives/templates/mmsViewSection.html
@@ -1,7 +1,7 @@
 <div ng-if="section.specification">
     <div ng-show="! isEditing">
-        <h1 class="section-title h{{level}}" ng-hide="inPreviewMode">{{section._veNumber}} {{section.name}}</h1>
-        <div ng-show="inPreviewMode"><h1 class="section-title h{{level}}">{{section._veNumber}} {{edit.name}}</h1></div>
+        <h1 class="section-title h{{level}}" ng-hide="inPreviewMode">{{section._veNumber}} <span ng-bind-html="section.name"></span></h1>
+        <div ng-show="inPreviewMode"><h1 class="section-title h{{level}}">{{section._veNumber}} <span ng-bind-html="edit.name"></span></h1></div>
     </div>
     <div ng-class="{'panel panel-default' : isEditing}">
         <div ng-class="{'no-display' : ! isEditing}" class="panel-heading clearfix no-print">
diff --git a/src/services/UtilsService.js b/src/services/UtilsService.js
index 8e27e85ee..ba7612e94 100644
--- a/src/services/UtilsService.js
+++ b/src/services/UtilsService.js
@@ -488,7 +488,7 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
     var makeHtmlTable = function(table, isFilterable, isSortable, pe) {
         var result = ['<table class="table-bordered table-condensed">'];
         if (ApplicationService.getState().inDoc && !table.excludeFromList) {
-            result.push('<caption>Table {{mmsPe._veNumber}}. {{table.title || mmsPe.name}}</caption>');
+            result.push('<caption>Table {{mmsPe._veNumber}}. <span ng-bind-html="table.title || mmsPe.name"></span></caption>');
         } else if (table.title) {
             result.push('<caption>' + table.title + '</caption>');
         }
@@ -818,8 +818,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
             //ob.tableCount++;
             prefix = 'Table ' + veNumber + '. ';
             var capTbl = el.find('table > caption');
-            name = capTbl.text();
-            if (name !== "" && name.indexOf('Table') === 0 && name.split('. ').length > 0) {
+            name = capTbl.html();
+            if (name && name.indexOf('Table') === 0 && name.split('. ').length > 0) {
                 name = name.substring(name.indexOf(prefix) + prefix.length);
             } else if (name === "") {
                 name = pe.name;
@@ -844,8 +844,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
             //ob.figureCount++;
             prefix = 'Figure ' + veNumber + '. ';
             var capFig = el.find('figure > figcaption');
-            name = capFig.text();
-            if (name !== "" && name.indexOf('Figure') === 0 && name.split('. ').length > 0) {
+            name = capFig.html();
+            if (name && name.indexOf('Figure') === 0 && name.split('. ').length > 0) {
                 name = name.substring(name.indexOf(prefix) + prefix.length);
             } else if (name === "") {
                 name = pe.name;
@@ -898,8 +898,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
         if (type === 'table') {
             prefix = 'Table ' + veNumber + '. ';
             var capTbl = el.find('table > caption');
-            name = capTbl.text();
-            if (name !== "" && name.indexOf('Table') === 0 && name.split('. ').length > 0) {
+            name = capTbl.html();
+            if (name && name.indexOf('Table') === 0 && name.split('. ').length > 0) {
                 name = name.substring(name.indexOf(prefix) + prefix.length);
             } else if (name === "") {
                 name = pe.name;
@@ -914,8 +914,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
         if (type === 'figure') {
             prefix = 'Figure ' + veNumber + '. ';
             var capFig = el.find('figure > figcaption');
-            name = capFig.text();
-            if (name !== "" && name.indexOf('Figure') === 0 && name.split('. ').length > 0) {
+            name = capFig.html();
+            if (name && name.indexOf('Figure') === 0 && name.split('. ').length > 0) {
                 name = name.substring(name.indexOf(prefix) + prefix.length);
             } else if (name === "") {
                 name = pe.name;