diff --git a/LCS/pyparameterset/src/__init__.py b/LCS/pyparameterset/src/__init__.py
index c0583daef88dc58388b42644d52d196cf564aa33..26885b03e29d6ff401b236f6f428d5a1659e76b9 100755
--- a/LCS/pyparameterset/src/__init__.py
+++ b/LCS/pyparameterset/src/__init__.py
@@ -127,7 +127,7 @@ class parameterset(PyParameterSet):
         return parameterset (ps, _copyObj=True)
 
     def keys(self):
-        """Get a sorted list of all parameter names."""
+        """Get the list of all parameter names."""
         return self.keywords()
 
     def dict(self):
diff --git a/LCS/pyparameterset/src/pyparameterset.cc b/LCS/pyparameterset/src/pyparameterset.cc
index a263de2ae6fbd93d53349c9682d4dd0fadcfa85e..c486682ddb26b7a70232583452a463f8830b04d3 100644
--- a/LCS/pyparameterset/src/pyparameterset.cc
+++ b/LCS/pyparameterset/src/pyparameterset.cc
@@ -39,7 +39,7 @@ namespace LOFAR {
   class PyParameterValue;
 
   // Declare function to convert vector of ParameterValue to PyParameterValue.
-  vector<PyParameterValue> convertPVVector (const vector<ParameterValue>& vec);
+  vector<PyParameterValue> convertVectorPV (const vector<ParameterValue>& vec);
 
   //# Make a class PyParameterSet to be able to add the function version().
   //# We also need a PyParameterValue.
@@ -58,7 +58,7 @@ namespace LOFAR {
     PyParameterValue expand() const
       { return ParameterValue::expand(); }
     vector<PyParameterValue> getVector() const
-      { return convertPVVector (ParameterValue::getVector()); }
+      { return convertVectorPV (ParameterValue::getVector()); }
     PyParameterSet getRecord() const;
   };    
 
@@ -88,12 +88,12 @@ namespace LOFAR {
       { return ParameterSet::get (key); }
 
     vector<PyParameterValue> getVector (const string& key) const
-      { return convertPVVector (ParameterSet::getVector(key)); }
+      { return convertVectorPV (ParameterSet::getVector(key)); }
 
     PyParameterSet getRecord (const string& key)
       { return ParameterSet::getRecord (key); }
 
-    // Return a sorted list of keywords.
+    // Return the list of keywords.
     vector<string> keywords() const
     {
       vector<string> result;
@@ -101,7 +101,6 @@ namespace LOFAR {
       for (ParameterSet::const_iterator iter=begin(); iter!=end(); ++iter) {
         result.push_back (iter->first);
       }
-      std::sort (result.begin(), result.end());
       return result;
     }
   };
@@ -109,7 +108,7 @@ namespace LOFAR {
  inline PyParameterSet PyParameterValue::getRecord() const
     { return ParameterValue::getRecord(); }
 
-  vector<PyParameterValue> convertPVVector (const vector<ParameterValue>& vec)
+  vector<PyParameterValue> convertVectorPV (const vector<ParameterValue>& vec)
   {
     vector<PyParameterValue> out;
     out.reserve (vec.size());