diff --git a/include/ircd/params.h b/include/ircd/params.h
index 1dd7e2491..5cef021ef 100644
--- a/include/ircd/params.h
+++ b/include/ircd/params.h
@@ -67,7 +67,7 @@ ircd::util::params::at(const size_t &i,
                         const T &def)
 const try
 {
-	return tokens_count(in, sep) > i? at<T>(i) : def;
+	return token_count(in, sep) > i? at<T>(i) : def;
 }
 catch(const bad_lex_cast &e)
 {
@@ -101,7 +101,7 @@ inline ircd::string_view
 ircd::util::params::operator[](const size_t &i)
 const
 {
-	return tokens_count(in, sep) > i? token(in, sep, i) : string_view{};
+	return token_count(in, sep) > i? token(in, sep, i) : string_view{};
 }
 
 inline const char *
diff --git a/include/ircd/tokens.h b/include/ircd/tokens.h
index f70d7e8d7..77cfb9326 100644
--- a/include/ircd/tokens.h
+++ b/include/ircd/tokens.h
@@ -83,8 +83,8 @@ namespace ircd
 	C<T, Comp, A> tokens(const string_view &str, const sep &);
 
 	// Convenience to get individual tokens
-	size_t tokens_count(const string_view &str, const char &sep);
-	size_t tokens_count(const string_view &str, const char *const &sep);
+	size_t token_count(const string_view &str, const char &sep);
+	size_t token_count(const string_view &str, const char *const &sep);
 	string_view token(const string_view &str, const char &sep, const size_t &at);
 	string_view token(const string_view &str, const char *const &sep, const size_t &at);
 	string_view token_last(const string_view &str, const char &sep);
diff --git a/ircd/lexical.cc b/ircd/lexical.cc
index c867127b4..b36ddee8d 100644
--- a/ircd/lexical.cc
+++ b/ircd/lexical.cc
@@ -138,16 +138,16 @@ ircd::token(const string_view &str,
 }
 
 size_t
-ircd::tokens_count(const string_view &str,
-                   const char &sep)
+ircd::token_count(const string_view &str,
+                  const char &sep)
 {
 	const char ssep[2] { sep, '\0' };
-	return tokens_count(str, ssep);
+	return token_count(str, ssep);
 }
 
 size_t
-ircd::tokens_count(const string_view &str,
-                   const char *const &sep)
+ircd::token_count(const string_view &str,
+                  const char *const &sep)
 {
 	using type = string_view;
 	using iter = typename type::const_iterator;