diff --git a/src/cgi_env.cpp b/src/cgi_env.cpp
index 00e3e61..24d5aa0 100644
--- a/src/cgi_env.cpp
+++ b/src/cgi_env.cpp
@@ -65,7 +65,7 @@ namespace tawashi {
 	} //unnamed namespace
 
 	CGIEnv::CGIEnv() :
-		m_cgi_env(get_cgi_vars())
+		m_cgi_env(get_cgi_environment_vars())
 	{
 	}
 
diff --git a/src/envy.cpp b/src/envy.cpp
index d0d07dc..4778717 100644
--- a/src/envy.cpp
+++ b/src/envy.cpp
@@ -2,7 +2,7 @@
 #include "get_env.hpp"
 
 namespace tawashi {
-	std::vector<std::string> get_cgi_vars() {
+	std::vector<std::string> get_cgi_environment_vars() {
 		using boost::string_ref;
 
 		std::vector<std::string> retlist;
diff --git a/src/envy.hpp b/src/envy.hpp
index 0b1020b..6a48218 100644
--- a/src/envy.hpp
+++ b/src/envy.hpp
@@ -25,5 +25,5 @@ namespace tawashi {
 		SERVER_SOFTWARE
 	);
 
-	std::vector<std::string> get_cgi_vars();
+	std::vector<std::string> get_cgi_environment_vars();
 } //namespace tawashi