diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2c01b2d..3611ab99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Extra data about drill marks in gerber files.
+- Problems using internal names for drill maps in gerb_drill output (#47).
 
 
 ## [0.9.0] - 2021-01-04
diff --git a/kibot/out_any_drill.py b/kibot/out_any_drill.py
index 5d896e61..c3e136b5 100644
--- a/kibot/out_any_drill.py
+++ b/kibot/out_any_drill.py
@@ -111,10 +111,9 @@ class AnyDrill(BaseOptions):
         for d in files:
             kicad_id = '-'+d if d else d
             kibot_id = self.solve_id(d)
-            if self._ext == 'drl':
-                k_file = self.expand_filename(output_dir, '%f'+kicad_id+'.%x', '', self._ext)
-            else:  # gbr
-                k_file = self.expand_filename(output_dir, '%f'+kicad_id+'-drl.%x', '', self._ext)
+            if self._ext == 'gbr':
+                kicad_id += '-drl'
+            k_file = self.expand_filename(output_dir, '%f'+kicad_id+'.%x', '', self._ext)
             file = ''
             if self.output:
                 file = self.expand_filename(output_dir, self.output, kibot_id, self._ext)
diff --git a/tests/yaml_samples/drill.kibot.yaml b/tests/yaml_samples/drill.kibot.yaml
index eb121141..69626b3c 100644
--- a/tests/yaml_samples/drill.kibot.yaml
+++ b/tests/yaml_samples/drill.kibot.yaml
@@ -23,4 +23,5 @@ outputs:
     dir: Drill
     options:
       use_aux_axis_as_origin: false
+      map: 'pdf'
 
diff --git a/tests/yaml_samples/drill_legacy.kiplot.yaml b/tests/yaml_samples/drill_legacy.kiplot.yaml
index 57e9a24a..b5863c6c 100644
--- a/tests/yaml_samples/drill_legacy.kiplot.yaml
+++ b/tests/yaml_samples/drill_legacy.kiplot.yaml
@@ -28,4 +28,7 @@ outputs:
     options:
       output: ''
       use_aux_axis_as_origin: false
+      map:
+        output: ''
+        type: 'pdf'
 
diff --git a/tests/yaml_samples/drill_legacy_s.kiplot.yaml b/tests/yaml_samples/drill_legacy_s.kiplot.yaml
index a9ba2e24..5b2a5d33 100644
--- a/tests/yaml_samples/drill_legacy_s.kiplot.yaml
+++ b/tests/yaml_samples/drill_legacy_s.kiplot.yaml
@@ -27,4 +27,7 @@ outputs:
     options:
       output: ''
       use_aux_axis_as_origin: false
+      map:
+        output: ''
+        type: 'pdf'
 
diff --git a/tests/yaml_samples/drill_single.kibot.yaml b/tests/yaml_samples/drill_single.kibot.yaml
index 766b2547..43fa55b8 100644
--- a/tests/yaml_samples/drill_single.kibot.yaml
+++ b/tests/yaml_samples/drill_single.kibot.yaml
@@ -22,4 +22,5 @@ outputs:
     dir: Drill
     options:
       use_aux_axis_as_origin: false
+      map: 'pdf'