diff --git a/src/Combiner.cpp b/src/Combiner.cpp
index c89721b5..7035fbf0 100644
--- a/src/Combiner.cpp
+++ b/src/Combiner.cpp
@@ -97,7 +97,7 @@ void CombinerInfo::init()
 {
 	m_pCurrent = NULL;
 	m_pUniformCollection = createUniformCollection();
-	m_bShaderCacheSupported = config.generalEmulation.shaderStorage != 0 && OGLVideo::isExtensionSupported(GET_PROGRAM_BINARY_EXTENSION);
+	m_bShaderCacheSupported = config.generalEmulation.enableShadersStorage != 0 && OGLVideo::isExtensionSupported(GET_PROGRAM_BINARY_EXTENSION);
 
 	m_shadersLoaded = 0;
 	if (m_bShaderCacheSupported && !_loadCombinersCache()) {
diff --git a/src/Config.cpp b/src/Config.cpp
index 70b51cda..6d92dd55 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -34,7 +34,7 @@ void Config::resetToDefaults()
 	generalEmulation.enableNoise = 1;
 	generalEmulation.enableHWLighting = 0;
 	generalEmulation.enableCustomSettings = 1;
-	generalEmulation.shaderStorage = 0;
+	generalEmulation.enableShadersStorage = 0;
 	generalEmulation.hacks = 0;
 #ifdef ANDROID
 	generalEmulation.forcePolygonOffset = 0;
diff --git a/src/Config.h b/src/Config.h
index e5dccd72..924f0b03 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -46,7 +46,7 @@ struct Config
 		u32 enableLOD;
 		u32 enableHWLighting;
 		u32 enableCustomSettings;
-		u32 shaderStorage;
+		u32 enableShadersStorage;
 		u32 hacks;
 #ifdef ANDROID
 		u32 forcePolygonOffset;
diff --git a/src/mupenplus/Config_mupenplus.cpp b/src/mupenplus/Config_mupenplus.cpp
index 9e9da544..9da269ba 100644
--- a/src/mupenplus/Config_mupenplus.cpp
+++ b/src/mupenplus/Config_mupenplus.cpp
@@ -66,7 +66,7 @@ bool Config_SetDefault()
 	assert(res == M64ERR_SUCCESS);
 	res = ConfigSetDefaultBool(g_configVideoGliden64, "EnableHWLighting", config.generalEmulation.enableHWLighting, "Enable hardware per-pixel lighting.");
 	assert(res == M64ERR_SUCCESS);
-	res = ConfigSetDefaultBool(g_configVideoGliden64, "EnableShaderStorage", config.generalEmulation.shaderStorage, "Use persistent storage for compiled shaders.");
+	res = ConfigSetDefaultBool(g_configVideoGliden64, "EnableShadersStorage", config.generalEmulation.enableShadersStorage, "Use persistent storage for compiled shaders.");
 	assert(res == M64ERR_SUCCESS);
 #ifdef ANDROID
 	res = ConfigSetDefaultBool(g_configVideoGliden64, "ForcePolygonOffset", config.generalEmulation.forcePolygonOffset, "If true, use polygon offset values specified below");
@@ -181,7 +181,7 @@ void Config_LoadConfig()
 	config.generalEmulation.enableNoise = ConfigGetParamBool(g_configVideoGliden64, "EnableNoise");
 	config.generalEmulation.enableLOD = ConfigGetParamBool(g_configVideoGliden64, "EnableLOD");
 	config.generalEmulation.enableHWLighting = ConfigGetParamBool(g_configVideoGliden64, "EnableHWLighting");
-	config.generalEmulation.shaderStorage = ConfigGetParamBool(g_configVideoGliden64, "EnableShaderStorage");
+	config.generalEmulation.enableShadersStorage = ConfigGetParamBool(g_configVideoGliden64, "EnableShadersStorage");
 #ifdef ANDROID
 	config.generalEmulation.forcePolygonOffset = ConfigGetParamBool(g_configVideoGliden64, "ForcePolygonOffset");
 	config.generalEmulation.polygonOffsetFactor = ConfigGetParamFloat(g_configVideoGliden64, "PolygonOffsetFactor");