diff --git a/source/options.txt b/source/options.txt
index 9529fb4..5c27574 100644
--- a/source/options.txt
+++ b/source/options.txt
@@ -96,7 +96,7 @@ thdl.Jskad.do.not.confirm.quit = false
 thdl.Jskad.do.not.fix.curly.braces.in.rtf = false
 
 # What font should be used for the result of TMW->Unicode conversions?
-thdl.tmw.to.unicode.font = Ximalaya
+thdl.tmw.to.unicode.font = Tibetan Machine Uni
 
 
 ############################################################################
diff --git a/source/org/thdl/tib/input/jskad_doc.html b/source/org/thdl/tib/input/jskad_doc.html
index 7925b61..7707c6f 100644
--- a/source/org/thdl/tib/input/jskad_doc.html
+++ b/source/org/thdl/tib/input/jskad_doc.html
@@ -418,7 +418,7 @@ need be.
 </p>
 
 <p>
-  At present, the TMW-&gt;Unicode conversion converts to the Ximalaya
+  At present, the TMW-&gt;Unicode conversion converts to the Tibetan Machine Uni
   font.&nbsp; If users ask for it, the converter can easily be
   extended to convert to the font of the user's choice.<!-- FIXME:
   what about 0020, 2003, 54xx, etc.?  Allow for specifying the fonts
diff --git a/source/org/thdl/tib/text/TibetanDocument.java b/source/org/thdl/tib/text/TibetanDocument.java
index 5ca08af..208e9ab 100644
--- a/source/org/thdl/tib/text/TibetanDocument.java
+++ b/source/org/thdl/tib/text/TibetanDocument.java
@@ -680,7 +680,7 @@ public class TibetanDocument extends DefaultStyledDocument {
         @param errors if non-null, then notes about all exceptional
         cases will be appended to this StringBuffer
         @param unicodeFont the name of the Unicode font to use;
-        defaults to Ximalaya if null
+        defaults to Tibetan Machine Uni if null
         @param numAttemptedReplacements an array that contains one
         element; this first element will be, upon exit, incremented by
         the number of TMW glyphs that we encountered and attempted to
@@ -1269,7 +1269,7 @@ public class TibetanDocument extends DefaultStyledDocument {
     /** Returns all the paragraph elements in this document that
      *  contain glyphs with offsets in the range [start, end) where
      *  end < 0 is treated as the document's length.  Note that roman,
-     *  TM, Ximalaya, and TMW text can all be intermingled
+     *  TM, Tibetan Machine Uni, and TMW text can all be intermingled
      *  within a paragraph.  It's the correct level of abstraction to
      *  use, however, because the next finer grain is roughly one
      *  Element per glyph. */
diff --git a/source/org/thdl/tib/text/TibetanMachineWeb.java b/source/org/thdl/tib/text/TibetanMachineWeb.java
index 521597e..cd54be5 100644
--- a/source/org/thdl/tib/text/TibetanMachineWeb.java
+++ b/source/org/thdl/tib/text/TibetanMachineWeb.java
@@ -333,7 +333,7 @@ public class TibetanMachineWeb implements THDLWylieConstants {
 
         defaultUnicodeFontAttributeSet = new SimpleAttributeSet();
         StyleConstants.setFontFamily(defaultUnicodeFontAttributeSet,
-                                     "Ximalaya");
+                                     "Tibetan Machine Uni");
 
         webFontAttributeSet[0] = null;
         for (int i=1; i<webFontAttributeSet.length; i++) {
@@ -873,12 +873,12 @@ public static SimpleAttributeSet getAttributeSet(int font) {
 * order to be able to put styled text into {@link TibetanDocument
 * TibetanDocument}.
 * @param unicodeFont the interned name of the Unicode font to use;
-* defaults to Ximalaya if null
+* defaults to Tibetan Machine Uni if null
 * @return a SimpleAttributeSet for the Unicode font - that is, a way
 * of encoding the font itself */
 public static SimpleAttributeSet getUnicodeAttributeSet(String unicodeFont) {
     if (null == unicodeFont
-        || "Ximalaya" == unicodeFont)
+        || "Tibetan Machine Uni" == unicodeFont)
         return defaultUnicodeFontAttributeSet;
     else {
         SimpleAttributeSet cached