diff --git a/README.md b/README.md
index 92258bc..a7d944f 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,10 @@ Converts Reflex maps (Version 8 and below) into id Tech map files.  A pre-compil
 
 ####Convert map geometry and entities:
 ```bash
-        ./reflex2q3 [input].map [output].map -e [entity file].ent
+        ./reflex2q3 [input].map [output].map -e [entity file].rem
 ```
 
-We've provided Quake 3 and Xonotic entity conversion files (r2q3.ent and r2xonotic.ent).  To create entity files for other games built on the [id Tech 3](https://en.wikipedia.org/wiki/Id_Tech_3) engine or previous [id Tech](https://en.wikipedia.org/wiki/Id_Tech) engines, refer to our [Reflex entity documentation](https://git.teknik.io/scuti/reflex2q3/src/f2b0341da38b82ad4f0a0cf258b0f6e6d8335fda/docs/doc-entities.txt), our sample .ent files, and relevant documentation for your game.
+We've provided Quake 3 and Xonotic entity conversion files (r2q3.rem and r2xonotic.rem).  To create entity files for other games built on the [id Tech 3](https://en.wikipedia.org/wiki/Id_Tech_3) engine or previous [id Tech](https://en.wikipedia.org/wiki/Id_Tech) engines, refer to our [Reflex entity documentation](https://git.teknik.io/scuti/reflex2q3/src/f2b0341da38b82ad4f0a0cf258b0f6e6d8335fda/docs/doc-entities.txt), our sample .rem files, and relevant documentation for your game.
 
 ####List all command line arguments:
 ```bash
diff --git a/include/EntityConverter.hpp b/include/EntityConverter.hpp
index 01e9ffe..f35b423 100644
--- a/include/EntityConverter.hpp
+++ b/include/EntityConverter.hpp
@@ -57,8 +57,8 @@ class EntityConverter
      *      Method:  Constructor
      * Description:  Creates entity format mapping
      *     CAUTION:  Requires extractMapInfo method to be called after this
-     *    Requires:  .ent filename for mapping entities from reflex format to xonotic format
-     *      THROWS:  runtime_error on .ent format error
+     *    Requires:  Reflex Entity Mapping filename
+     *      THROWS:  runtime_error on Reflex Entity Mapping file format error
      *      THROWS:  std::ios::failure on IO failure
      *--------------------------------------------------------------------------------------
      */
@@ -69,7 +69,7 @@ class EntityConverter
      * Description:  Creates entity format mapping  and pre-scans for map info
      *   Parameter:  string entityMapFile, file maps source to target entity formats
      *   Parameter:  string reflexMapFile, for pre-scan
-     *      THROWS:  runtime_error on .ent format error
+     *      THROWS:  runtime_error on Reflex Entity Mapping file format error
      *      THROWS:  std::ios::failure on IO failure
      *--------------------------------------------------------------------------------------
      */
diff --git a/r2q3.ent b/r2q3.rem
similarity index 100%
rename from r2q3.ent
rename to r2q3.rem
diff --git a/r2xonotic.ent b/r2xonotic.rem
similarity index 100%
rename from r2xonotic.ent
rename to r2xonotic.rem
diff --git a/src/EntityConverter.cpp b/src/EntityConverter.cpp
index 7aadede..47c41c9 100644
--- a/src/EntityConverter.cpp
+++ b/src/EntityConverter.cpp
@@ -684,7 +684,7 @@ EntityConverter::mapEntities (const std::string &mapFile)
   fin.open (mapFile);
 
   if (fin.is_open()) {
-    //Read .ent contents into pickup map
+    //Read Reflex Entity Mapping file contents into pickup map
     std::string line;
     while (std::getline (fin, line)) {
       std::istringstream iss (line);
@@ -698,7 +698,7 @@ EntityConverter::mapEntities (const std::string &mapFile)
     }
   }
   else {
-    throw std::ios::failure ("Error: EntityConverter failed to open .ent file");
+    throw std::ios::failure ("Error: EntityConverter failed to open Reflex Entity Mapping file");
   }
   fin.close();
 
diff --git a/test/catch-entityconverter.cpp b/test/catch-entityconverter.cpp
index 612a99d..9319ea7 100644
--- a/test/catch-entityconverter.cpp
+++ b/test/catch-entityconverter.cpp
@@ -21,7 +21,7 @@
 
 #include "EntityConverter.hpp"
 
-#define ENTITY_FILENAME "r2xonotic.ent"
+#define ENTITY_FILENAME "r2xonotic.rem"
 #define DELTA 0.00001