diff --git a/README b/README
index 925d6b3014..bc43214a72 100644
--- a/README
+++ b/README
@@ -199,7 +199,7 @@ You can also run gnucash --help for the command line options.
 
 You can start GnuCash at the command-line, with "gnucash" or "gnucash
 <filename>", where <filename> is a GnuCash account file.  Sample
-accounts can be found in "data" subdirectory.  *.xac files are GnuCash
+accounts can be found in "data" subdirectory.  *.gnucash files are GnuCash
 accounts that can opened with the "Open File" menu entry.  *.qif files
 are Quicken Import Format files that can be opened with the "Import
 QIF" menu entry.
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 354737b664..46a5341636 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -11,22 +11,22 @@ doc_DATA = \
   abc.qif \
   bogus.qif \
   cbb-export.qif \
-  currency.xac \
-  currency_tree_xml.xac \
+  currency.gnucash \
+  currency_tree_xml.gnucash \
   every.qif \
   ms-money.qif \
   quicktest.qif \
-  splitdemo.xac \
+  splitdemo.gnucash \
   swipe.qif \
-  taxreport.xac \
-  test.xac \
-  test2.xac \
-  test3.xac \
-  test4.xac \
-  trading.xac \
-  trading2.xac \
+  taxreport.gnucash \
+  test.gnucash \
+  test2.gnucash \
+  test3.gnucash \
+  test4.gnucash \
+  trading.gnucash \
+  trading2.gnucash \
   web.qif \
-  xfer.xac
+  xfer.gnucash
 
 EXTRA_DIST = \
   ${doc_DATA}
diff --git a/doc/examples/currency.xac b/doc/examples/currency.gnucash
similarity index 100%
rename from doc/examples/currency.xac
rename to doc/examples/currency.gnucash
diff --git a/doc/examples/currency_tree_xml.xac b/doc/examples/currency_tree_xml.gnucash
similarity index 100%
rename from doc/examples/currency_tree_xml.xac
rename to doc/examples/currency_tree_xml.gnucash
diff --git a/doc/examples/reg_doc_example.xac b/doc/examples/reg_doc_example.gnucash
similarity index 100%
rename from doc/examples/reg_doc_example.xac
rename to doc/examples/reg_doc_example.gnucash
diff --git a/doc/examples/splitdemo.xac b/doc/examples/splitdemo.gnucash
similarity index 100%
rename from doc/examples/splitdemo.xac
rename to doc/examples/splitdemo.gnucash
diff --git a/doc/examples/taxreport.xac b/doc/examples/taxreport.gnucash
similarity index 100%
rename from doc/examples/taxreport.xac
rename to doc/examples/taxreport.gnucash
diff --git a/doc/examples/test.xac b/doc/examples/test.gnucash
similarity index 100%
rename from doc/examples/test.xac
rename to doc/examples/test.gnucash
diff --git a/doc/examples/test2.xac b/doc/examples/test2.gnucash
similarity index 100%
rename from doc/examples/test2.xac
rename to doc/examples/test2.gnucash
diff --git a/doc/examples/test3.xac b/doc/examples/test3.gnucash
similarity index 100%
rename from doc/examples/test3.xac
rename to doc/examples/test3.gnucash
diff --git a/doc/examples/test4.xac b/doc/examples/test4.gnucash
similarity index 100%
rename from doc/examples/test4.xac
rename to doc/examples/test4.gnucash
diff --git a/doc/examples/trading.xac b/doc/examples/trading.gnucash
similarity index 100%
rename from doc/examples/trading.xac
rename to doc/examples/trading.gnucash
diff --git a/doc/examples/trading2.xac b/doc/examples/trading2.gnucash
similarity index 100%
rename from doc/examples/trading2.xac
rename to doc/examples/trading2.gnucash
diff --git a/doc/examples/xfer.xac b/doc/examples/xfer.gnucash
similarity index 100%
rename from doc/examples/xfer.xac
rename to doc/examples/xfer.gnucash
diff --git a/src/core-utils/test/test-gnc-uri-utils.c b/src/core-utils/test/test-gnc-uri-utils.c
index 147fae6433..70d09ad60c 100644
--- a/src/core-utils/test/test-gnc-uri-utils.c
+++ b/src/core-utils/test/test-gnc-uri-utils.c
@@ -52,28 +52,28 @@ test_strings strs[] =
 #ifndef G_OS_WIN32
     /* basic file tests in posix like environment */
     {
-        "/test/path/file.xacc", FALSE,
-        "file", NULL, NULL, NULL, "/test/path/file.xacc", 0,
-        "file:///test/path/file.xacc",
-        "file:///test/path/file.xacc", TRUE
+        "/test/path/file.gnucash", FALSE,
+        "file", NULL, NULL, NULL, "/test/path/file.gnucash", 0,
+        "file:///test/path/file.gnucash",
+        "file:///test/path/file.gnucash", TRUE
     },
     {
-        "file:///test/path/file.xacc", FALSE,
-        "file", NULL, NULL, NULL, "/test/path/file.xacc", 0,
-        "file:///test/path/file.xacc",
-        "file:///test/path/file.xacc", TRUE
+        "file:///test/path/file.gnucash", FALSE,
+        "file", NULL, NULL, NULL, "/test/path/file.gnucash", 0,
+        "file:///test/path/file.gnucash",
+        "file:///test/path/file.gnucash", TRUE
     },
     {
-        "xml:///test/path/file.xacc", FALSE,
-        "xml", NULL, NULL, NULL, "/test/path/file.xacc", 0,
-        "xml:///test/path/file.xacc",
-        "xml:///test/path/file.xacc", TRUE
+        "xml:///test/path/file.gnucash", FALSE,
+        "xml", NULL, NULL, NULL, "/test/path/file.gnucash", 0,
+        "xml:///test/path/file.gnucash",
+        "xml:///test/path/file.gnucash", TRUE
     },
     {
-        "sqlite3:///test/path/file.xacc", FALSE,
-        "sqlite3", NULL, NULL, NULL, "/test/path/file.xacc", 0,
-        "sqlite3:///test/path/file.xacc",
-        "sqlite3:///test/path/file.xacc", TRUE
+        "sqlite3:///test/path/file.gnucash", FALSE,
+        "sqlite3", NULL, NULL, NULL, "/test/path/file.gnucash", 0,
+        "sqlite3:///test/path/file.gnucash",
+        "sqlite3:///test/path/file.gnucash", TRUE
     },
 #else
     /* basic file tests in windows environment */
diff --git a/src/experimental/cgi-bin/gnc-server.c b/src/experimental/cgi-bin/gnc-server.c
index 8e80efa326..3288a199c8 100644
--- a/src/experimental/cgi-bin/gnc-server.c
+++ b/src/experimental/cgi-bin/gnc-server.c
@@ -224,7 +224,7 @@ main (int argc, char *argv[])
     /* this should really be an SQL server */
     book = qof_book_new ();
 
-    rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
+    rc = gnc_book_begin (book, "file:/tmp/demo.gnucash", FALSE);
     if (!rc) goto bookerrexit;
 
     rc = gnc_book_load (book);
diff --git a/src/experimental/cgi-bin/hello2.c b/src/experimental/cgi-bin/hello2.c
index 7ceb1ec9b4..e099ffd428 100644
--- a/src/experimental/cgi-bin/hello2.c
+++ b/src/experimental/cgi-bin/hello2.c
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
     /* contact the database, which is a flat file for this demo */
     book = qof_book_new ();
 
-    rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
+    rc = gnc_book_begin (book, "file:/tmp/demo.gnucash", FALSE);
     if (!rc)
     {
         int err = gnc_book_get_error (book);
diff --git a/src/experimental/cgi-bin/hello3.c b/src/experimental/cgi-bin/hello3.c
index f84dd0cdcd..a5ac6626d1 100644
--- a/src/experimental/cgi-bin/hello3.c
+++ b/src/experimental/cgi-bin/hello3.c
@@ -36,7 +36,7 @@ main (int argc, char *argv[])
     /* contact the database, which is a flat file for this demo */
     book = qof_book_new ();
 
-    rc = gnc_book_begin (book, "file:/tmp/demo.xac", FALSE);
+    rc = gnc_book_begin (book, "file:/tmp/demo.gnucash", FALSE);
     if (!rc) goto bookerrexit;
 
     rc = gnc_book_load (book);