diff --git a/core/Maker/MakeRepositoryQuery.php b/core/Maker/MakeRepositoryQuery.php
index 9986e94..21b27d5 100644
--- a/core/Maker/MakeRepositoryQuery.php
+++ b/core/Maker/MakeRepositoryQuery.php
@@ -48,9 +48,9 @@ class MakeRepositoryQuery extends AbstractMaker
         );
 
         $queryDetails = $generator->createClassNameDetails(
-            $repositoryClass,
+            $repositoryClass.'Query',
             'Repository\\',
-            'Query'
+            ''
         );
 
         $id = u($queryDetails->getShortName())