diff --git a/projects/configgen/configgen/generators/libretro/libretroControllers.py b/projects/configgen/configgen/generators/libretro/libretroControllers.py
index e62942d81c1ac92f53b776861e73b979a419e0a9..afca0ddb5e38578cca63bbb5893a7a063ee203a8 100644
--- a/projects/configgen/configgen/generators/libretro/libretroControllers.py
+++ b/projects/configgen/configgen/generators/libretro/libretroControllers.py
@@ -169,8 +169,8 @@ class LibretroControllers:
         InputItem.ItemY     : 'y',
         InputItem.ItemL1    : 'l2',
         InputItem.ItemR1    : 'r2',
-        InputItem.ItemL2    : 'l',
-        InputItem.ItemR2    : 'r',
+        InputItem.ItemL2    : 'l2',
+        InputItem.ItemR2    : 'r2',
         InputItem.ItemL3    : 'l3',
         InputItem.ItemR3    : 'r3',
         InputItem.ItemStart : 'start',
@@ -364,7 +364,7 @@ class LibretroControllers:
                 btnmap = self.retroarchmegadrivebtns
 
         # Define L2/R2 on L1/R1 if controllers don't have L2/R2 for Dreamcast
-        if not controller.HasL2 and not controller.HasR2 and system.Name == "dreamcast" and not is_jamma:
+        if system.Name == "dreamcast" and not is_jamma:
             btnmap = self.retroarchdreamcastbtns
 
         if system.RotateControls: