diff --git a/milc.py b/milc.py
index defdf91..7b130bd 100644
--- a/milc.py
+++ b/milc.py
@@ -180,13 +180,13 @@ class ConfigurationSection(Configuration):
         self.parent = parent
 
     def __getitem__(self, key):
-        """Returns a config value, pulling from the `default` section as a fallback.
+        """Returns a config value, pulling from the `user` section as a fallback.
         """
         if key in self._config:
             return self._config[key]
 
-        elif key in self.parent.default:
-            return self.parent.default[key]
+        elif key in self.parent.user:
+            return self.parent.user[key]
 
         return None
 
@@ -429,11 +429,12 @@ class MILC(object):
                 self.arg_only.append(arg_name)
                 del kwargs['arg_only']
 
+            name = handler.__name__.replace("_", "-")
             if handler is self._entrypoint:
                 self.add_argument(*args, **kwargs)
 
-            elif handler.__name__ in self.subcommands:
-                self.subcommands[handler.__name__].add_argument(*args, **kwargs)
+            elif name in self.subcommands:
+                self.subcommands[name].add_argument(*args, **kwargs)
 
             else:
                 raise RuntimeError('Decorated function is not entrypoint or subcommand!')
@@ -599,7 +600,7 @@ class MILC(object):
             self.add_subparsers()
 
         if not name:
-            name = handler.__name__
+            name = handler.__name__.replace("_", "-")
 
         self.acquire_lock()
         kwargs['help'] = description