diff --git a/src/Commands/DataMakeCommand.php b/src/Commands/DataMakeCommand.php
index 1b26dac1..075c51fa 100644
--- a/src/Commands/DataMakeCommand.php
+++ b/src/Commands/DataMakeCommand.php
@@ -30,14 +30,14 @@ protected function resolveStubPath($stub): string
 
     protected function getDefaultNamespace($rootNamespace): string
     {
-        $namespace = trim($this->option('namespace') ?? 'Data', '\\');
+        $namespace = trim($this->option('namespace'), '\\');
 
         return trim($rootNamespace . '\\' . $namespace, '\\');
     }
 
     protected function qualifyClass($name): string
     {
-        $suffix = trim($this->option('suffix') ?? 'Data');
+        $suffix = trim($this->option('suffix'));
         if (! empty($suffix) && ! Str::endsWith($name, $suffix)) {
             $name = $name . $suffix;
         }