diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index a4355c663a..54860493c3 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -15,17 +15,17 @@ SET(csv_import_SOURCES
   csv-account-import.c
   gnc-csv-account-map.c
   gnc-csv-gnumeric-popup.c
-  gnc-csv-tokenizer.cpp
-  gnc-csv-import-settings.cpp
-  gnc-csv-price-import-settings.cpp
-  gnc-csv-trans-import-settings.cpp
-  gnc-dummy-tokenizer.cpp
-  gnc-fw-tokenizer.cpp
-  gnc-price-import.cpp
-  gnc-price-props.cpp
+  gnc-imp-props-price.cpp
+  gnc-imp-props-tx.cpp
+  gnc-imp-settings-csv.cpp
+  gnc-imp-settings-csv-price.cpp
+  gnc-imp-settings-csv-tx.cpp
+  gnc-import-price.cpp
+  gnc-import-tx.cpp
   gnc-tokenizer.cpp
-  gnc-trans-props.cpp
-  gnc-tx-import.cpp
+  gnc-tokenizer-csv.cpp
+  gnc-tokenizer-dummy.cpp
+  gnc-tokenizer-fw.cpp
 )
 
 # Add dependency on config.h
@@ -45,17 +45,17 @@ SET(csv_import_noinst_HEADERS
   csv-account-import.h
   gnc-csv-account-map.h
   gnc-csv-gnumeric-popup.h
-  gnc-csv-tokenizer.hpp
-  gnc-csv-import-settings.hpp
-  gnc-csv-price-import-settings.hpp
-  gnc-csv-trans-import-settings.hpp
-  gnc-dummy-tokenizer.hpp
-  gnc-fw-tokenizer.hpp
-  gnc-price-import.hpp
-  gnc-price-props.hpp
+  gnc-imp-props-price.hpp
+  gnc-imp-props-tx.hpp
+  gnc-imp-settings-csv.hpp
+  gnc-imp-settings-csv-price.hpp
+  gnc-imp-settings-csv-tx.hpp
+  gnc-import-price.hpp
+  gnc-import-tx.hpp
   gnc-tokenizer.hpp
-  gnc-trans-props.hpp
-  gnc-tx-import.hpp
+  gnc-tokenizer-csv.hpp
+  gnc-tokenizer-dummy.hpp
+  gnc-tokenizer-fw.hpp
 )
 
 ADD_LIBRARY(gncmod-csv-import ${csv_import_noinst_HEADERS}
diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
index 0db5c64b97..a4a3ef7fcc 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * assistant-csv-price-import.c -- An assistant for importing       *
+ * assistant-csv-price-import.cpp -- An assistant for importing     *
  *                                     Prices from a file.          *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
@@ -52,10 +52,10 @@ extern "C"
 #include "go-charmap-sel.h"
 }
 
-#include "gnc-csv-price-import-settings.hpp"
-#include "gnc-price-import.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-tokenizer.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
+#include "gnc-import-price.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-tokenizer-csv.hpp"
 
 #define MIN_COL_WIDTH 70
 #define GNC_PREFS_GROUP "dialogs.import.csv"
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index c9100decdb..397a353914 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -59,10 +59,10 @@ extern "C"
 #include "go-charmap-sel.h"
 }
 
-#include "gnc-csv-trans-import-settings.hpp"
-#include "gnc-tx-import.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-tokenizer.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
+#include "gnc-import-tx.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-tokenizer-csv.hpp"
 
 #include <boost/locale.hpp>
 
diff --git a/gnucash/import-export/csv-imp/gnc-price-props.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-price-props.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
index 151bd38ad2..1a3ec7b727 100644
--- a/gnucash/import-export/csv-imp/gnc-price-props.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
@@ -1,6 +1,6 @@
 /********************************************************************\
- * gnc-price-props.cpp - encapsulate price properties for use       *
- *                       in the csv importer                        *
+ * gnc-imp-props-price.cpp - encapsulate price properties for use   *
+ *                           in the csv importer                    *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -37,7 +37,7 @@ extern "C" {
 #include <string>
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
-#include "gnc-price-props.hpp"
+#include "gnc-imp-props-price.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-price-props.hpp b/gnucash/import-export/csv-imp/gnc-imp-props-price.hpp
similarity index 95%
rename from gnucash/import-export/csv-imp/gnc-price-props.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-price.hpp
index 3a358612af..055cc4d12a 100644
--- a/gnucash/import-export/csv-imp/gnc-price-props.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-price.hpp
@@ -1,6 +1,6 @@
 /********************************************************************\
- * gnc-price-props.hpp - encapsulate price properties for use       *
- *                       in the csv importer                        *
+ * gnc-imp-props-price.hpp - encapsulate price properties for use   *
+ *                           in the csv importer                    *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -58,7 +58,7 @@ enum class GncPricePropType {
 enum Result { FAILED, ADDED, DUPLICATED, REPLACED };
 
 /** Maps all column types to a string representation.
- *  The actual definition is in gnc-price-props.cpp.
+ *  The actual definition is in gnc-imp-props-price.cpp.
  *  Attention: that definition should be adjusted for any
  *  changes to enum class GncPricePropType ! */
 extern std::map<GncPricePropType, const char*> gnc_price_col_type_strs;
diff --git a/gnucash/import-export/csv-imp/gnc-trans-props.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-trans-props.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
index 2aaae3492a..650f4e95ee 100644
--- a/gnucash/import-export/csv-imp/gnc-trans-props.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-csv-imp-trans.cpp - import transactions from csv files       *
+ * gnc-imp-props-tx.cpp - import transactions from csv files        *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -41,7 +41,7 @@ extern "C" {
 #include <string>
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
-#include "gnc-trans-props.hpp"
+#include "gnc-imp-props-tx.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-trans-props.hpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-trans-props.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
index 47c23bad7d..ee0052926a 100644
--- a/gnucash/import-export/csv-imp/gnc-trans-props.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
@@ -1,6 +1,6 @@
 /********************************************************************\
- * gnc-trans-props.hpp - encapsulate transaction properties for use *
- *                       in the csv importer                        *
+ * gnc-imp-props-tx.hpp - encapsulate transaction properties for    *
+ *                        use in the csv importer                   *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
diff --git a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
index 8ebe9eba6b..0f985edfc4 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-price-import-settings.cpp -- Price CSV Import Settings   *
+ * gnc-imp-settings-csv-price.cpp -- Price CSV Import Settings      *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
  *                                                                  *
@@ -20,14 +20,14 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-price-import-settings.cpp
+/** @file gnc-imp-settings-csv-price.cpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
 */
 
-#include "gnc-csv-import-settings.hpp"
-#include "gnc-csv-price-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
 #include <sstream>
 
 extern "C"
diff --git a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
similarity index 94%
rename from gnucash/import-export/csv-imp/gnc-csv-price-import-settings.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
index e0d52b480e..f1833e5d50 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-price-import-settings.hpp  -- Price CSV Import Settings  *
+ * gnc-imp-settings-csv-price.hpp  -- Price CSV Import Settings     *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
  *                                                                  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-price-import-settings.hpp
+/** @file gnc-imp-settings-csv-price.hpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
@@ -36,9 +36,9 @@ extern "C" {
 
 #include <string>
 #include <vector>
-#include "gnc-price-props.hpp"
+#include "gnc-imp-props-price.hpp"
 #include "gnc-tokenizer.hpp"
-#include "gnc-csv-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
 
 struct CsvPriceImpSettings : public CsvImportSettings
 {
diff --git a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
index 17ac2b79c3..da085735cc 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-trans-import-settings.cpp -- Trans CSV Import Settings   *
+ * gnc-imp-settings-csv-tx.cpp -- Trans CSV Import Settings      *
  *                                                                  *
  * Copyright (C) 2014 Robert Fewell                                 *
  *                                                                  *
@@ -20,14 +20,14 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-trans-import-settings.cpp
+/** @file gnc-imp-settings-csv-tx.cpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
 */
 
-#include "gnc-csv-import-settings.hpp"
-#include "gnc-csv-trans-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
 #include <sstream>
 
 extern "C"
diff --git a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
similarity index 93%
rename from gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
index c93ef3a7ce..254a41d64f 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-trans-import-settings.hpp  -- Trans CSV Import Settings  *
+ * gnc-imp-settings-csv-tx.hpp  -- Trans CSV Import Settings  *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
  *                                                                  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-trans-import-settings.hpp
+/** @file gnc-imp-settings-csv-tx.hpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
@@ -36,9 +36,9 @@ extern "C" {
 
 #include <string>
 #include <vector>
-#include "gnc-trans-props.hpp"
+#include "gnc-imp-props-tx.hpp"
 #include "gnc-tokenizer.hpp"
-#include "gnc-csv-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
 
 struct CsvTransImpSettings : public CsvImportSettings
 {
diff --git a/gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
index 7c5e362bfd..d0ab9e99f3 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-import-settings.cpp -- Save and Load CSV Import Settings *
+ * gnc-imp-settings-csv.cpp -- Save and Load CSV Import Settings *
  *                                                                  *
  * Copyright (C) 2014 Robert Fewell                                 *
  *                                                                  *
@@ -20,13 +20,13 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-import-settings.cpp
+/** @file gnc-imp-settings-csv.cpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
 */
 
-#include "gnc-csv-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
 #include <sstream>
 
 extern "C"
diff --git a/gnucash/import-export/csv-imp/gnc-csv-import-settings.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-csv-import-settings.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
index 6102fed144..c051cc1ee0 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-import-settings.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-import-settings.hpp -- Save and Load CSV Import Settings *
+ * gnc-imp-settings-csv.hpp -- Save and Load CSV Import Settings *
  *                                                                  *
  * Copyright (C) 2014 Robert Fewell                                 *
  *                                                                  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-import-settings.hpp
+/** @file gnc-imp-settings-csv.hpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
diff --git a/gnucash/import-export/csv-imp/gnc-price-import.cpp b/gnucash/import-export/csv-imp/gnc-import-price.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-price-import.cpp
rename to gnucash/import-export/csv-imp/gnc-import-price.cpp
index 0bc1ead8a1..f4aa64575f 100644
--- a/gnucash/import-export/csv-imp/gnc-price-import.cpp
+++ b/gnucash/import-export/csv-imp/gnc-import-price.cpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-price-import.cpp - import prices from csv files              *
+ * gnc-import-price.cpp - import prices from csv files              *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -38,11 +38,11 @@ extern "C" {
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
 
-#include "gnc-price-import.hpp"
-#include "gnc-price-props.hpp"
-#include "gnc-csv-tokenizer.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-price-import-settings.hpp"
+#include "gnc-import-price.hpp"
+#include "gnc-imp-props-price.hpp"
+#include "gnc-tokenizer-csv.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-price-import.hpp b/gnucash/import-export/csv-imp/gnc-import-price.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-price-import.hpp
rename to gnucash/import-export/csv-imp/gnc-import-price.hpp
index 7d181ec168..38f54cc594 100644
--- a/gnucash/import-export/csv-imp/gnc-price-import.hpp
+++ b/gnucash/import-export/csv-imp/gnc-import-price.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-price-import.hpp - import prices from csv files              *
+ * gnc-import-price.hpp - import prices from csv files              *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -22,7 +22,7 @@
 /** @file
      @brief Class to import prices from CSV or fixed width files
      *
-     gnc-price-import.hpp
+     gnc-import-price.hpp
      @author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
      @author Copyright (c) 2017 Robert Fewell
  */
@@ -41,8 +41,8 @@ extern "C" {
 #include <memory>
 
 #include "gnc-tokenizer.hpp"
-#include "gnc-price-props.hpp"
-#include "gnc-csv-price-import-settings.hpp"
+#include "gnc-imp-props-price.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
 #include <boost/optional.hpp>
 
 /* A set of currency formats that the user sees. */
diff --git a/gnucash/import-export/csv-imp/gnc-tx-import.cpp b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-tx-import.cpp
rename to gnucash/import-export/csv-imp/gnc-import-tx.cpp
index 3b65944cb4..ae9383e6b2 100644
--- a/gnucash/import-export/csv-imp/gnc-tx-import.cpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-tx-import.cpp - import transactions from csv or fixed-width  *
+ * gnc-import-tx.cpp - import transactions from csv or fixed-width  *
  *                     files                                        *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
@@ -35,11 +35,11 @@ extern "C" {
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
 
-#include "gnc-tx-import.hpp"
-#include "gnc-trans-props.hpp"
-#include "gnc-csv-tokenizer.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-trans-import-settings.hpp"
+#include "gnc-import-tx.hpp"
+#include "gnc-imp-props-tx.hpp"
+#include "gnc-tokenizer-csv.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-tx-import.hpp b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-tx-import.hpp
rename to gnucash/import-export/csv-imp/gnc-import-tx.hpp
index 4fc339cbb3..0e20854911 100644
--- a/gnucash/import-export/csv-imp/gnc-tx-import.hpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-tx-import.hpp - import transactions from csv files       *
+ * gnc-import-tx.hpp - import transactions from csv files           *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -22,7 +22,7 @@
 /** @file
      @brief Class to import transactions from CSV or fixed width files
      *
-     gnc-tx-import.hpp
+     gnc-import-tx.hpp
      @author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
  */
 
@@ -42,8 +42,8 @@ extern "C" {
 #include <memory>
 
 #include "gnc-tokenizer.hpp"
-#include "gnc-trans-props.hpp"
-#include "gnc-csv-trans-import-settings.hpp"
+#include "gnc-imp-props-tx.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
 #include <boost/optional.hpp>
 
 
diff --git a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
index 4812511268..402900a791 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
@@ -1,4 +1,4 @@
-#include "gnc-csv-tokenizer.hpp"
+#include "gnc-tokenizer-csv.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.hpp
similarity index 96%
rename from gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-csv.hpp
index af1f37b28c..ef75632e64 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-csv-tokenizer.hpp - takes a csv file and converts it into a  *
+ * gnc-tokenizer-csv.hpp - takes a csv file and converts it into a  *
  *                         two-dimensional vector of strings (table)*
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
@@ -27,7 +27,7 @@
      However, no gnucash specific interpretation is done yet, that's up
      to the code using this class.
      *
-     gnc-csv-tokenizer.hpp
+     gnc-tokenizer-csv.hpp
      @author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
  */
 
diff --git a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
similarity index 94%
rename from gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
index c54517e1f4..1da593b3d7 100644
--- a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
@@ -1,4 +1,4 @@
-#include "gnc-dummy-tokenizer.hpp"
+#include "gnc-tokenizer-dummy.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.hpp
similarity index 91%
rename from gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-dummy.hpp
index 805d86e4b4..5bedfee3b2 100644
--- a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.hpp
@@ -1,8 +1,7 @@
 /********************************************************************\
- * gnc-dummy-tokenizer.hpp - takes a file and converts it into a       *
+ * gnc-tokenizer-dummy.hpp - takes a file and converts it into a    *
  *                        two-dimensional vector of strings (table) *
- *                        splitting the contents on fixed width     *
- *                        positions                                 *
+ *                        each row will only have one single column *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -29,7 +28,7 @@
      This is just a dummy that can be used as long as the file format isn't
      specified yet by the user.
      *
-     gnc-dummy-tokenizer.hpp
+     gnc-tokenizer-dummy.hpp
      @author Copyright (c) 2016 Geert Janssens <geert@kobaltwit.be>
  */
 
diff --git a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
index 18fb2f54eb..9ec861289c 100644
--- a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
@@ -1,4 +1,4 @@
-#include "gnc-fw-tokenizer.hpp"
+#include "gnc-tokenizer-fw.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
index 6465a8ca39..d2eca2e799 100644
--- a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-fw-tokenizer.hpp - takes a file and converts it into a       *
+ * gnc-tokenizer-fw.hpp - takes a file and converts it into a       *
  *                        two-dimensional vector of strings (table) *
  *                        splitting the contents on fixed width     *
  *                        positions                                 *
@@ -30,7 +30,7 @@
      However, no gnucash specific interpretation is done yet, that's up
      to the code using this class.
      *
-     gnc-fw-tokenizer.hpp
+     gnc-tokenizer-fw.hpp
      @author Copyright (c) 2015 Geert Janssens <geert@kobaltwit.be>
  */
 
diff --git a/gnucash/import-export/csv-imp/gnc-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
index f9f27e1a3d..7b14a2d77d 100644
--- a/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
@@ -1,7 +1,7 @@
 #include "gnc-tokenizer.hpp"
-#include "gnc-csv-tokenizer.hpp"
-#include "gnc-dummy-tokenizer.hpp"
-#include "gnc-fw-tokenizer.hpp"
+#include "gnc-tokenizer-csv.hpp"
+#include "gnc-tokenizer-dummy.hpp"
+#include "gnc-tokenizer-fw.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index 977847553e..c97902a9e7 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -26,8 +26,8 @@
 
 #include <guid.hpp>
 #include "../gnc-tokenizer.hpp"
-#include "../gnc-csv-tokenizer.hpp"
-#include "../gnc-fw-tokenizer.hpp"
+#include "../gnc-tokenizer-csv.hpp"
+#include "../gnc-tokenizer-fw.hpp"
 #include <gtest/gtest.h>
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/test/test-tx-import.cpp b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
index 76a43625fa..60d7ec1647 100644
--- a/gnucash/import-export/csv-imp/test/test-tx-import.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
@@ -24,8 +24,8 @@
 
 #include <guid.hpp>
 #include "../gnc-tokenizer.hpp"
-#include "../gnc-csv-tokenizer.hpp"
-#include "../gnc-fw-tokenizer.hpp"
+#include "../gnc-tokenizer-csv.hpp"
+#include "../gnc-tokenizer-fw.hpp"
 #include <gtest/gtest.h>
 #include <iostream>
 #include <fstream>      // fstream
@@ -34,7 +34,7 @@
 #include <stdlib.h>     /* getenv */
 
 /* Add specific headers for this class */
-#include "../gnc-tx-import.hpp"
+#include "../gnc-import-tx.hpp"
 
 //typedef struct
 //{
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d9f7bc84e1..0e02226450 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -307,19 +307,19 @@ gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
 gnucash/import-export/csv-imp/csv-account-import.c
 gnucash/import-export/csv-imp/gnc-csv-account-map.c
 gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
-gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp
-gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp
-gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
-gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp
-gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
-gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
+gnucash/import-export/csv-imp/gnc-import-price.cpp
+gnucash/import-export/csv-imp/gnc-import-tx.cpp
+gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
+gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
+gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
+gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
+gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
 gnucash/import-export/csv-imp/gncmod-csv-import.c
 gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
-gnucash/import-export/csv-imp/gnc-price-import.cpp
-gnucash/import-export/csv-imp/gnc-price-props.cpp
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp
-gnucash/import-export/csv-imp/gnc-trans-props.cpp
-gnucash/import-export/csv-imp/gnc-tx-import.cpp
+gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
+gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
+gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
 gnucash/import-export/customer-import/dialog-customer-import.c
 gnucash/import-export/customer-import/dialog-customer-import-gui.c
 gnucash/import-export/customer-import/gncmod-customer-import.c