diff --git a/src/cpl_query/_extension/iterable.py b/src/cpl_query/_extension/iterable.py
index 60f1b94d..2361fe67 100644
--- a/src/cpl_query/_extension/iterable.py
+++ b/src/cpl_query/_extension/iterable.py
@@ -2,17 +2,17 @@ from typing import Optional, Callable, Union
 
 from cpl_query._extension.ordered_iterable import OrderedIterable
 from cpl_query.extension.ordered_iterable_abc import OrderedIterableABC
-from .._query.all_query import all_query
-from .._query.any_query import any_query
-from .._query.avg_query import avg_query
-from .._query.contains_query import contains_query
-from .._query.count_query import count_query
-from .._query.distinct_query import distinct_query
-from .._query.first_query import first_or_default_query, first_query
-from .._query.for_each_query import for_each_query
+from .._query.all import all_query
+from .._query.any import any_query
+from .._query.avg import avg_query
+from .._query.contains import contains_query
+from .._query.count import count_query
+from .._query.distinct import distinct_query
+from .._query.first import first_or_default_query, first_query
+from .._query.for_each import for_each_query
 from .._query.order_by import order_by_query, order_by_descending_query
-from .._query.single_query import single_query, single_or_default_query
-from .._query.where_query import where_query
+from .._query.single import single_query, single_or_default_query
+from .._query.where import where_query
 from cpl_query.extension.iterable_abc import IterableABC
 
 
diff --git a/src/cpl_query/_query/all_query.py b/src/cpl_query/_query/all.py
similarity index 89%
rename from src/cpl_query/_query/all_query.py
rename to src/cpl_query/_query/all.py
index 07c40a51..76aa2fb0 100644
--- a/src/cpl_query/_query/all_query.py
+++ b/src/cpl_query/_query/all.py
@@ -1,6 +1,6 @@
 from collections import Callable
 
-from cpl_query._query.where_query import where_query
+from cpl_query._query.where import where_query
 from cpl_query.exceptions import ExceptionArgument, ArgumentNoneException
 from cpl_query.extension.iterable_abc import IterableABC
 
diff --git a/src/cpl_query/_query/any_query.py b/src/cpl_query/_query/any.py
similarity index 89%
rename from src/cpl_query/_query/any_query.py
rename to src/cpl_query/_query/any.py
index ede1c0d8..ab63c154 100644
--- a/src/cpl_query/_query/any_query.py
+++ b/src/cpl_query/_query/any.py
@@ -1,6 +1,6 @@
 from collections import Callable
 
-from cpl_query._query.where_query import where_query
+from cpl_query._query.where import where_query
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
 from cpl_query.extension.iterable_abc import IterableABC
 
diff --git a/src/cpl_query/_query/avg_query.py b/src/cpl_query/_query/avg.py
similarity index 100%
rename from src/cpl_query/_query/avg_query.py
rename to src/cpl_query/_query/avg.py
diff --git a/src/cpl_query/_query/contains_query.py b/src/cpl_query/_query/contains.py
similarity index 100%
rename from src/cpl_query/_query/contains_query.py
rename to src/cpl_query/_query/contains.py
diff --git a/src/cpl_query/_query/count_query.py b/src/cpl_query/_query/count.py
similarity index 88%
rename from src/cpl_query/_query/count_query.py
rename to src/cpl_query/_query/count.py
index 246feee1..a4a87096 100644
--- a/src/cpl_query/_query/count_query.py
+++ b/src/cpl_query/_query/count.py
@@ -1,6 +1,6 @@
 from collections import Callable
 
-from cpl_query._query.where_query import where_query
+from cpl_query._query.where import where_query
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
 from cpl_query.extension.iterable_abc import IterableABC
 
diff --git a/src/cpl_query/_query/distinct_query.py b/src/cpl_query/_query/distinct.py
similarity index 100%
rename from src/cpl_query/_query/distinct_query.py
rename to src/cpl_query/_query/distinct.py
diff --git a/src/cpl_query/_query/first_query.py b/src/cpl_query/_query/first.py
similarity index 100%
rename from src/cpl_query/_query/first_query.py
rename to src/cpl_query/_query/first.py
diff --git a/src/cpl_query/_query/for_each_query.py b/src/cpl_query/_query/for_each.py
similarity index 100%
rename from src/cpl_query/_query/for_each_query.py
rename to src/cpl_query/_query/for_each.py
diff --git a/src/cpl_query/_query/single_query.py b/src/cpl_query/_query/single.py
similarity index 100%
rename from src/cpl_query/_query/single_query.py
rename to src/cpl_query/_query/single.py
diff --git a/src/cpl_query/_query/where_query.py b/src/cpl_query/_query/where.py
similarity index 100%
rename from src/cpl_query/_query/where_query.py
rename to src/cpl_query/_query/where.py