diff --git a/src/CLI.cpp b/src/CLI.cpp
index c7e2959ac..dcbe1051a 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -292,8 +292,8 @@ const std::string CLI::getFilter ()
 {
   // Remove all the syntactic sugar.
   unsweetenTags ();
-  unsweetenAtts ();
-  unsweetenAttMods ();
+  unsweetenAttributes ();
+  unsweetenAttributeModifiers ();
   // TODO all the other types: pattern, id, uuid ...
 
   std::string filter = "";
@@ -547,7 +547,7 @@ void CLI::unsweetenTags ()
 
 ////////////////////////////////////////////////////////////////////////////////
 // <name>:['"][<value>]['"] --> name = value
-void CLI::unsweetenAtts ()
+void CLI::unsweetenAttributes ()
 {
   std::vector <A> reconstructed;
   std::vector <A>::iterator a;
@@ -633,7 +633,7 @@ void CLI::unsweetenAtts ()
 
 ////////////////////////////////////////////////////////////////////////////////
 // <name>.<mod>[:=]['"]<value>['"] --> name <op> value
-void CLI::unsweetenAttMods ()
+void CLI::unsweetenAttributeModifiers ()
 {
   std::vector <A> reconstructed;
   std::vector <A>::iterator a;
diff --git a/src/CLI.h b/src/CLI.h
index d8f254641..cbf70dbfa 100644
--- a/src/CLI.h
+++ b/src/CLI.h
@@ -77,8 +77,8 @@ private:
   bool exactMatch (const std::string&, const std::string&) const;
   bool canonicalize (std::string&, const std::string&, const std::string&) const;
   void unsweetenTags ();
-  void unsweetenAtts ();
-  void unsweetenAttMods ();
+  void unsweetenAttributes ();
+  void unsweetenAttributeModifiers ();
   void dump (const std::string&) const;
 
 public: