diff --git a/main/src/data_test.clj b/main/src/data_test.clj
index 0b42d6c..d910bae 100644
--- a/main/src/data_test.clj
+++ b/main/src/data_test.clj
@@ -18,7 +18,7 @@
    [clojure.test :as t]
    [schema.core :as s]
    [data-test.reporter :as reporter]
-   [data-test.file-loader :as loader]))
+   [data-test.loader :as loader]))
 
 (def TestDataSpec loader/TestDataSpec)
 
diff --git a/main/src/data_test/file_loader.clj b/main/src/data_test/loader.clj
similarity index 98%
rename from main/src/data_test/file_loader.clj
rename to main/src/data_test/loader.clj
index 594f259..d522816 100644
--- a/main/src/data_test/file_loader.clj
+++ b/main/src/data_test/loader.clj
@@ -13,7 +13,7 @@
 ; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
-(ns data-test.file-loader
+(ns data-test.loader
   (:require
    [clojure.java.io :as io]
    [clojure.string :as str]
diff --git a/test/resources/data_test/file_loader_test/test_it.1.edn b/test/resources/data_test/loader_test/test_it.1.edn
similarity index 100%
rename from test/resources/data_test/file_loader_test/test_it.1.edn
rename to test/resources/data_test/loader_test/test_it.1.edn
diff --git a/test/resources/data_test/file_loader_test/test_it.9.edn b/test/resources/data_test/loader_test/test_it.9.edn
similarity index 100%
rename from test/resources/data_test/file_loader_test/test_it.9.edn
rename to test/resources/data_test/loader_test/test_it.9.edn
diff --git a/test/resources/data_test/file_loader_test/test_it.edn b/test/resources/data_test/loader_test/test_it.edn
similarity index 100%
rename from test/resources/data_test/file_loader_test/test_it.edn
rename to test/resources/data_test/loader_test/test_it.edn
diff --git a/test/resources/data_test/runner_test/test_it.edn b/test/resources/data_test/runner_test/test_it.edn
deleted file mode 100644
index e85d33d..0000000
--- a/test/resources/data_test/runner_test/test_it.edn
+++ /dev/null
@@ -1 +0,0 @@
-{:test "data"}
\ No newline at end of file
diff --git a/test/src/data_test/file_loader_test.clj b/test/src/data_test/loader_test.clj
similarity index 66%
rename from test/src/data_test/file_loader_test.clj
rename to test/src/data_test/loader_test.clj
index fdf60e2..92a934b 100644
--- a/test/src/data_test/file_loader_test.clj
+++ b/test/src/data_test/loader_test.clj
@@ -13,12 +13,12 @@
 ; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
-(ns data-test.file-loader-test
+(ns data-test.loader-test
   (:require
    [clojure.test :refer :all]
    [clojure.java.io :as io]
    [schema.core :as s]
-   [data-test.file-loader :as sut]))
+   [data-test.loader :as sut]))
 
 (deftest should-read-test-data-spec
   (is (= {:simple "test"}
@@ -28,26 +28,26 @@
   )
 
 (deftest should-calculate-data-test-spec-file-prefix
-  (is (= "data_test/file_loader_test/test_it"
+  (is (= "data_test/loader_test/test_it"
          (sut/data-test-spec-file-prefix ::test-it))))
 
 (deftest should-list-all-posible-resources
-  (is (= '("data_test/file_loader_test/test_it.edn"
-           "data_test/file_loader_test/test_it.0.edn"
-           "data_test/file_loader_test/test_it.1.edn"
-           "data_test/file_loader_test/test_it.2.edn"
-           "data_test/file_loader_test/test_it.3.edn"
-           "data_test/file_loader_test/test_it.4.edn"
-           "data_test/file_loader_test/test_it.5.edn"
-           "data_test/file_loader_test/test_it.6.edn"
-           "data_test/file_loader_test/test_it.7.edn"
-           "data_test/file_loader_test/test_it.8.edn"
-           "data_test/file_loader_test/test_it.9.edn")
+  (is (= '("data_test/loader_test/test_it.edn"
+           "data_test/loader_test/test_it.0.edn"
+           "data_test/loader_test/test_it.1.edn"
+           "data_test/loader_test/test_it.2.edn"
+           "data_test/loader_test/test_it.3.edn"
+           "data_test/loader_test/test_it.4.edn"
+           "data_test/loader_test/test_it.5.edn"
+           "data_test/loader_test/test_it.6.edn"
+           "data_test/loader_test/test_it.7.edn"
+           "data_test/loader_test/test_it.8.edn"
+           "data_test/loader_test/test_it.9.edn")
          (sut/data-test-spec-file-names ::test-it))))
 
 (deftest should-load-data
   (is (= {:test "data"
-          :data-spec-file "data_test/file_loader_test/test_it.edn"}
+          :data-spec-file "data_test/loader_test/test_it.edn"}
          (sut/load-data-test-spec (str (sut/data-test-spec-file-prefix ::test-it) ".edn")))))
 
 (deftest should-not-load-non-existing-data
@@ -56,11 +56,11 @@
 
 (deftest should-load-data-test-specs
   (is (= [{:test "data"
-           :data-spec-file "data_test/file_loader_test/test_it.edn"} 
+           :data-spec-file "data_test/loader_test/test_it.edn"} 
           {:test "data1"
-           :data-spec-file "data_test/file_loader_test/test_it.1.edn"} 
+           :data-spec-file "data_test/loader_test/test_it.1.edn"} 
           {:test "data9"
-           :data-spec-file "data_test/file_loader_test/test_it.9.edn"}]
+           :data-spec-file "data_test/loader_test/test_it.9.edn"}]
          (sut/load-data-test-specs ::test-it))))
 
 (deftest should-throw-exception
diff --git a/test/src/data_test_test.clj b/test/src/data_test_test.clj
index fa7bd5c..d051fec 100644
--- a/test/src/data_test_test.clj
+++ b/test/src/data_test_test.clj
@@ -18,7 +18,7 @@
    [clojure.test :refer :all]
    [clojure.java.io :as io]
    [schema.core :as s]
-   [data-test.file-loader :as fl]
+   [data-test.loader :as fl]
    [data-test :as sut]))
 
 ; -------------------- explicit version ------------------