diff --git a/src/libstore/include/nix/store/store-dir-config.hh b/src/libstore/include/nix/store/store-dir-config.hh
index 40a71e446..6bf9ebf14 100644
--- a/src/libstore/include/nix/store/store-dir-config.hh
+++ b/src/libstore/include/nix/store/store-dir-config.hh
@@ -104,7 +104,7 @@ struct MixStoreDirMethods
  * Need to make this a separate class so I can get the right
  * initialization order in the constructor for `StoreDirConfig`.
  */
-struct StoreDirConfigItself : Config
+struct StoreDirConfigBase : Config
 {
     using Config::Config;
 
@@ -118,12 +118,12 @@ struct StoreDirConfigItself : Config
 };
 
 /**
- * The order of `StoreDirConfigItself` and then `MixStoreDirMethods` is
- * very important. This ensures that `StoreDirConfigItself::storeDir_`
+ * The order of `StoreDirConfigBase` and then `MixStoreDirMethods` is
+ * very important. This ensures that `StoreDirConfigBase::storeDir_`
  * is initialized before we have our one chance (because references are
  * immutable) to initialize `MixStoreDirMethods::storeDir`.
  */
-struct StoreDirConfig : StoreDirConfigItself, MixStoreDirMethods
+struct StoreDirConfig : StoreDirConfigBase, MixStoreDirMethods
 {
     using Params = std::map<std::string, std::string>;
 
diff --git a/src/libstore/store-dir-config.cc b/src/libstore/store-dir-config.cc
index 191926be6..ec65013ef 100644
--- a/src/libstore/store-dir-config.cc
+++ b/src/libstore/store-dir-config.cc
@@ -5,7 +5,7 @@
 namespace nix {
 
 StoreDirConfig::StoreDirConfig(const Params & params)
-    : StoreDirConfigItself(params)
+    : StoreDirConfigBase(params)
     , MixStoreDirMethods{storeDir_}
 {
 }