diff --git a/libuavcan/include/uavcan/protocol/param_server.hpp b/libuavcan/include/uavcan/protocol/param_server.hpp
index 2c23ac2bb5..a5818736c0 100644
--- a/libuavcan/include/uavcan/protocol/param_server.hpp
+++ b/libuavcan/include/uavcan/protocol/param_server.hpp
@@ -111,12 +111,11 @@ private:
 
 public:
     /**
-     * @param param_name_case_conversion    Specifies the parameter name conversion mode. Lower case is default,
-     *                                      which means that an external request for a parameter named "Foo" will
-     *                                      be relayed to the application as "foo".
+     * @param param_name_case_conversion    Specifies the parameter name conversion mode. Conversion is
+     *                                      disabled by default, i.e. parameter names are case-sensitive.
      */
     explicit ParamServer(INode& node,
-                         ParamNameCaseConversion param_name_case_conversion = ParamNameCaseConversionToLower)
+                         ParamNameCaseConversion param_name_case_conversion = ParamNameCaseConversionDisabled)
         : get_set_srv_(node)
         , save_erase_srv_(node)
         , manager_(NULL)
diff --git a/libuavcan/test/protocol/param_server.cpp b/libuavcan/test/protocol/param_server.cpp
index 054b007395..9eb84c5667 100644
--- a/libuavcan/test/protocol/param_server.cpp
+++ b/libuavcan/test/protocol/param_server.cpp
@@ -91,7 +91,7 @@ TEST(ParamServer, Basic)
 {
     InterlinkedTestNodesWithSysClock nodes;
 
-    uavcan::ParamServer server(nodes.a);
+    uavcan::ParamServer server(nodes.a, uavcan::ParamServer::ParamNameCaseConversionToLower);
 
     ParamServerTestManager mgr;
 
@@ -208,7 +208,7 @@ TEST(ParamServer, NoCaseConversion)
 {
     InterlinkedTestNodesWithSysClock nodes;
 
-    uavcan::ParamServer server(nodes.a, uavcan::ParamServer::ParamNameCaseConversionDisabled);
+    uavcan::ParamServer server(nodes.a);
 
     ParamServerTestManager mgr;