diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dca6908..e4187e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable(${PROJECT_NAME}
 	response.cpp
 	submit_paste_response.cpp
 	get_env.cpp
-	envy.cpp
+	cgi_environment_vars.cpp
 	cgi_env.cpp
 	num_to_token.cpp
 	cgi_post.cpp
diff --git a/src/cgi_env.cpp b/src/cgi_env.cpp
index c923480..e40e839 100644
--- a/src/cgi_env.cpp
+++ b/src/cgi_env.cpp
@@ -1,5 +1,5 @@
 #include "cgi_env.hpp"
-#include "envy.hpp"
+#include "cgi_environment_vars.hpp"
 #include "duckhandy/lexical_cast.hpp"
 #include <cassert>
 #include <ciso646>
@@ -65,7 +65,7 @@ namespace cgi {
 	} //unnamed namespace
 
 	Env::Env() :
-		m_cgi_env(get_cgi_environment_vars())
+		m_cgi_env(cgi_environment_vars())
 	{
 	}
 
diff --git a/src/envy.cpp b/src/cgi_environment_vars.cpp
similarity index 80%
rename from src/envy.cpp
rename to src/cgi_environment_vars.cpp
index 4778717..d5fa138 100644
--- a/src/envy.cpp
+++ b/src/cgi_environment_vars.cpp
@@ -1,8 +1,8 @@
-#include "envy.hpp"
+#include "cgi_environment_vars.hpp"
 #include "get_env.hpp"
 
 namespace tawashi {
-	std::vector<std::string> get_cgi_environment_vars() {
+	std::vector<std::string> cgi_environment_vars() {
 		using boost::string_ref;
 
 		std::vector<std::string> retlist;
diff --git a/src/envy.hpp b/src/cgi_environment_vars.hpp
similarity index 88%
rename from src/envy.hpp
rename to src/cgi_environment_vars.hpp
index 6a48218..3b20aed 100644
--- a/src/envy.hpp
+++ b/src/cgi_environment_vars.hpp
@@ -25,5 +25,5 @@ namespace tawashi {
 		SERVER_SOFTWARE
 	);
 
-	std::vector<std::string> get_cgi_environment_vars();
+	std::vector<std::string> cgi_environment_vars();
 } //namespace tawashi