diff --git a/common/module.mk b/common/module.mk
index f26be66280f..b9ce15077e6 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -2,7 +2,6 @@ MODULE := common
 
 MODULE_OBJS := \
 	archive.o \
-	base-str.o \
 	concatstream.o \
 	config-manager.o \
 	coroutines.o \
@@ -29,6 +28,7 @@ MODULE_OBJS := \
 	str.o \
 	stream.o \
 	streamdebug.o \
+	str-base.o \
 	str-enc.o \
 	encodings/singlebyte.o \
 	system.o \
diff --git a/common/base-str.cpp b/common/str-base.cpp
similarity index 99%
rename from common/base-str.cpp
rename to common/str-base.cpp
index 0c044d30dd7..1b8b36f7339 100644
--- a/common/base-str.cpp
+++ b/common/str-base.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/base-str.h"
+#include "common/str-base.h"
 #include "common/hash-str.h"
 #include "common/list.h"
 #include "common/memorypool.h"
diff --git a/common/base-str.h b/common/str-base.h
similarity index 99%
rename from common/base-str.h
rename to common/str-base.h
index 6be8e731462..3c36abeb4b6 100644
--- a/common/base-str.h
+++ b/common/str-base.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef COMMON_BASE_STRING_H
-#define COMMON_BASE_STRING_H
+#ifndef COMMON_STR_BASE_H
+#define COMMON_STR_BASE_H
 
 #include "common/scummsys.h"
 #include "common/str-enc.h"
diff --git a/common/str.h b/common/str.h
index f5bc29399f2..f56f2ed8eb6 100644
--- a/common/str.h
+++ b/common/str.h
@@ -25,7 +25,7 @@
 #include "common/scummsys.h"
 #include "common/str-enc.h"
 #include "common/ustr.h"
-#include "common/base-str.h"
+#include "common/str-base.h"
 
 #include <stdarg.h>
 
diff --git a/common/ustr.h b/common/ustr.h
index 5687fce60ec..66a8c073669 100644
--- a/common/ustr.h
+++ b/common/ustr.h
@@ -25,7 +25,7 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 #include "common/str-enc.h"
-#include "common/base-str.h"
+#include "common/str-base.h"
 
 namespace Common {