diff --git a/config.go b/config.go
index 1f32d8fb3e..40c47e692c 100644
--- a/config.go
+++ b/config.go
@@ -19,9 +19,9 @@ type DaemonConfig struct {
 	InterContainerCommunication bool
 }
 
-// ConfigGetenv creates and returns a new DaemonConfig object
+// ConfigFromJob creates and returns a new DaemonConfig object
 // by parsing the contents of a job's environment.
-func ConfigGetenv(job *engine.Job) *DaemonConfig {
+func ConfigFromJob(job *engine.Job) *DaemonConfig {
 	var config DaemonConfig
 	config.Pidfile = job.Getenv("Pidfile")
 	config.Root = job.Getenv("Root")
diff --git a/server.go b/server.go
index e6cc729a99..08ee7a4974 100644
--- a/server.go
+++ b/server.go
@@ -35,7 +35,7 @@ func init() {
 }
 
 func JobServeApi(job *engine.Job) string {
-	srv, err := NewServer(ConfigGetenv(job))
+	srv, err := NewServer(ConfigFromJob(job))
 	if err != nil {
 		return err.Error()
 	}