diff --git a/smocore/opts.cpp b/smocore/opts.cpp
index 17c9b4c..5fa37af 100644
--- a/smocore/opts.cpp
+++ b/smocore/opts.cpp
@@ -32,11 +32,9 @@ const char* JustPrintUsageNoError::what() const noexcept
 }
 
 struct option OptionParser::longOptions[] = {
-    {"devicespec", required_argument, 0, 's'},
+    {"dapspec", required_argument, 0, 's'},
     {"spec", required_argument, 0, 's'},
-    {"devspec", required_argument, 0, 's'},
-    {"devfile", required_argument, 0, 'd'},
-    {"devicefile", required_argument, 0, 'd'},
+    {"dapfile", required_argument, 0, 'd'},
     {"api-lib", required_argument, 0, 'a'},
     {"apilib", required_argument, 0, 'a'},
     {"api", required_argument, 0, 'a'},
@@ -105,12 +103,14 @@ void OptionParser::parseArguments(int argc, char *argv[], char **envp)
 
 std::string OptionParser::getUsage() const
 {
-    return "Usage: " + argv0 + " [-s|--devicespec|--spec|--devspec <device_spec>] "
-           "[-d|--devfile|--devicefile <filename>] "
+    return "Usage: " + argv0 + " [-s|--dapspec|--spec <device_spec>] "
+           "[-d|--dapfile <DAP_spec_file>] "
            "[-a|--api-lib|--apilib|--api|--lib <filename>] "
            "[-p|--api-lib-path|--apipath|--libpath <directory>] "
            "[-v|--verbose] "
-           "[-h|--help]";
+           "[-h|--help]\n\n"
+           "Example DAP spec:\n"
+           "  -s '+edev|device-identifier|visual-implexor|xcb(dev-substring)|xorg(display=0|screen=0)|my-window'";
 }
 
 std::string OptionParser::stringifyOptions(void) const