diff --git a/spleeter/__main__.py b/spleeter/__main__.py
index 757b3da..c20de9a 100644
--- a/spleeter/__main__.py
+++ b/spleeter/__main__.py
@@ -93,7 +93,7 @@ def separate(
         codec: Codec = AudioCodecOption,
         duration: float = AudioDurationOption,
         offset: float = AudioOffsetOption,
-        output_path: Path = AudioAdapterOption,
+        output_path: Path = AudioOutputOption,
         stft_backend: STFTBackend = AudioSTFTBackendOption,
         filename_format: str = FilenameFormatOption,
         params_filename: str = ModelParametersOption,
@@ -167,7 +167,7 @@ def _compile_metrics(metrics_output_directory) -> Dict:
 @spleeter.command()
 def evaluate(
         adapter: str = AudioAdapterOption,
-        output_path: Path = AudioAdapterOption,
+        output_path: Path = AudioOutputOption,
         stft_backend: STFTBackend = AudioSTFTBackendOption,
         params_filename: str = ModelParametersOption,
         mus_dir: Path = MUSDBDirectoryOption,
diff --git a/tests/test_ffmpeg_adapter.py b/tests/test_ffmpeg_adapter.py
index dc4335f..9fe8e00 100644
--- a/tests/test_ffmpeg_adapter.py
+++ b/tests/test_ffmpeg_adapter.py
@@ -47,7 +47,7 @@ def audio_data(adapter):
 def test_default_adapter(adapter):
     """ Test adapter as default adapter. """
     assert isinstance(adapter, FFMPEGProcessAudioAdapter)
-    assert adapter is AudioAdapter.DEFAULT
+    assert adapter is AudioAdapter._DEFAULT
 
 
 def test_load(audio_data):