diff --git a/lib/chkname.c b/lib/chkname.c
index 8bde7a2d9..f9a284e45 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -31,8 +31,9 @@
 #include <sys/param.h>
 #include <unistd.h>
 
-#include "defines.h"
 #include "chkname.h"
+#include "defines.h"
+#include "string/strcmp/streq.h"
 
 
 int allow_bad_names = false;
@@ -70,9 +71,9 @@ is_valid_name(const char *name)
          */
 	int numeric;
 
-	if ('\0' == *name ||
-	    ('.' == *name && (('.' == name[1] && '\0' == name[2]) ||
-			      '\0' == name[1])) ||
+	if (streq(name, "") ||
+	    streq(name, ".") ||
+	    streq(name, "..") ||
 	    !((*name >= 'a' && *name <= 'z') ||
 	      (*name >= 'A' && *name <= 'Z') ||
 	      (*name >= '0' && *name <= '9') ||
@@ -92,7 +93,7 @@ is_valid_name(const char *name)
 		      *name == '_' ||
 		      *name == '.' ||
 		      *name == '-' ||
-		      (*name == '$' && name[1] == '\0')
+		      streq(name, "$")
 		     ))
 		{
 			errno = EINVAL;