diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h
index b766c5519a1..3e24711896a 100644
--- a/Util/ProgramOptions.h
+++ b/Util/ProgramOptions.h
@@ -197,12 +197,12 @@ inline unsigned GenerateServerProgramOptions(const int argc,
         "threads,t",
         boost::program_options::value<int>(&requested_num_threads)->default_value(8),
         "Number of threads to use")(
-        "sharedmemory,s",
+        "shared-memory,s",
         boost::program_options::value<bool>(&use_shared_memory)->implicit_value(true),
         "Load data from shared memory")(
-        "max_locations_distance_table",
+        "max-table-size,m",
         boost::program_options::value<int>(&max_locations_distance_table)->default_value(100),
-        "Max locations supported in distance table query");
+        "Max. locations supported in distance table query");
 
     // hidden options, will be allowed both on command line and in config
     // file, but will not be shown to the user
diff --git a/features/options/routed/help.feature b/features/options/routed/help.feature
index f11787d6cd2..4b89dcb2458 100644
--- a/features/options/routed/help.feature
+++ b/features/options/routed/help.feature
@@ -24,9 +24,9 @@ Feature: osrm-routed command line options: help
         And stdout should contain "--ip"
         And stdout should contain "--port"
         And stdout should contain "--threads"
-        And stdout should contain "--sharedmemory"
-        And stdout should contain "--max_locations_distance_table"
-        And stdout should contain 25 lines
+        And stdout should contain "--shared-memory"
+        And stdout should contain "--max-table-size"
+        And stdout should contain 24 lines
         And it should exit with code 0
 
     Scenario: osrm-routed - Help, short
@@ -49,9 +49,9 @@ Feature: osrm-routed command line options: help
         And stdout should contain "--ip"
         And stdout should contain "--port"
         And stdout should contain "--threads"
-        And stdout should contain "--sharedmemory"
-        And stdout should contain "--max_locations_distance_table"
-        And stdout should contain 25 lines
+        And stdout should contain "--shared-memory"
+        And stdout should contain "--max-table-size"
+        And stdout should contain 24 lines
         And it should exit with code 0
 
     Scenario: osrm-routed - Help, long
@@ -74,7 +74,7 @@ Feature: osrm-routed command line options: help
         And stdout should contain "--ip"
         And stdout should contain "--port"
         And stdout should contain "--threads"
-        And stdout should contain "--sharedmemory"
-        And stdout should contain "--max_locations_distance_table"
-        And stdout should contain 25 lines
+        And stdout should contain "--shared-memory"
+        And stdout should contain "--max-table-size"
+        And stdout should contain 24 lines
         And it should exit with code 0
diff --git a/features/support/launch.rb b/features/support/launch.rb
index 0f983c15142..d8d23aeaa6b 100644
--- a/features/support/launch.rb
+++ b/features/support/launch.rb
@@ -4,7 +4,7 @@
 
 # Only one isntance of osrm-routed is ever launched, to avoid collisions.
 # The default is to keep osrm-routed running and load data with datastore.
-# however, osrm-routed it shut down and relaunched for each scenario thats 
+# however, osrm-routed it shut down and relaunched for each scenario thats
 # loads data directly.
 class OSRMLoader
 
@@ -118,7 +118,7 @@ def load_data
 
     def osrm_up
       return if osrm_up?
-      @@pid = Process.spawn("#{BIN_PATH}/osrm-routed --sharedmemory=1 --port #{OSRM_PORT}",:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE)
+      @@pid = Process.spawn("#{BIN_PATH}/osrm-routed --shared-memory=1 --port #{OSRM_PORT}",:out=>OSRM_ROUTED_LOG_FILE, :err=>OSRM_ROUTED_LOG_FILE)
       Process.detach(@@pid)    # avoid zombie processes
     end
   end