diff --git a/modules/http_proxy_script.go b/modules/http_proxy_script.go
index 29a35f11..b164e37c 100644
--- a/modules/http_proxy_script.go
+++ b/modules/http_proxy_script.go
@@ -45,7 +45,7 @@ func LoadProxyScriptSource(path, source string, sess *session.Session) (err erro
 	}
 
 	// define session pointer
-	err = s.VM.Set("env", sess.Env.Storage)
+	err = s.VM.Set("env", sess.Env.Data)
 	if err != nil {
 		log.Error("Error while defining environment: %s", err)
 		return
diff --git a/session/environment.go b/session/environment.go
index 358b61a6..4a421308 100644
--- a/session/environment.go
+++ b/session/environment.go
@@ -15,7 +15,7 @@ type Environment struct {
 	sync.Mutex
 
 	Padding int               `json:"-"`
-	Storage map[string]string `json:"storage"`
+	Data    map[string]string `json:"data"`
 
 	cbs  map[string]SetCallback
 	sess *Session
@@ -24,7 +24,7 @@ type Environment struct {
 func NewEnvironment(s *Session) *Environment {
 	env := &Environment{
 		Padding: 0,
-		Storage: make(map[string]string),
+		Data:    make(map[string]string),
 		sess:    s,
 		cbs:     make(map[string]SetCallback),
 	}
@@ -36,7 +36,7 @@ func (env *Environment) Has(name string) bool {
 	env.Lock()
 	defer env.Unlock()
 
-	_, found := env.Storage[name]
+	_, found := env.Data[name]
 
 	return found
 }
@@ -57,8 +57,8 @@ func (env *Environment) Set(name, value string) string {
 	env.Lock()
 	defer env.Unlock()
 
-	old, _ := env.Storage[name]
-	env.Storage[name] = value
+	old, _ := env.Data[name]
+	env.Data[name] = value
 
 	if cb, hasCallback := env.cbs[name]; hasCallback == true {
 		cb(value)
@@ -78,7 +78,7 @@ func (env *Environment) Get(name string) (bool, string) {
 	env.Lock()
 	defer env.Unlock()
 
-	if value, found := env.Storage[name]; found == true {
+	if value, found := env.Data[name]; found == true {
 		return true, value
 	}
 
@@ -102,7 +102,7 @@ func (env *Environment) Sorted() []string {
 	defer env.Unlock()
 
 	var keys []string
-	for k := range env.Storage {
+	for k := range env.Data {
 		keys = append(keys, k)
 	}
 	sort.Strings(keys)
diff --git a/session/session_core_handlers.go b/session/session_core_handlers.go
index e08eb0c5..4670f13a 100644
--- a/session/session_core_handlers.go
+++ b/session/session_core_handlers.go
@@ -132,7 +132,7 @@ func (s *Session) getHandler(args []string, sess *Session) error {
 				prev_ns = ns
 			}
 
-			fmt.Printf("  %"+strconv.Itoa(s.Env.Padding)+"s: '%s'\n", k, s.Env.Storage[k])
+			fmt.Printf("  %"+strconv.Itoa(s.Env.Padding)+"s: '%s'\n", k, s.Env.Data[k])
 		}
 		fmt.Println()
 	} else if found, value := s.Env.Get(key); found == true {
@@ -241,7 +241,7 @@ func (s *Session) registerCoreHandlers() {
 		readline.PcItem("get", readline.PcItemDynamic(func(prefix string) []string {
 			prefix = core.Trim(prefix[3:])
 			varNames := []string{""}
-			for key := range s.Env.Storage {
+			for key := range s.Env.Data {
 				if prefix == "" || strings.HasPrefix(key, prefix) == true {
 					varNames = append(varNames, key)
 				}
@@ -256,7 +256,7 @@ func (s *Session) registerCoreHandlers() {
 		readline.PcItem("set", readline.PcItemDynamic(func(prefix string) []string {
 			prefix = core.Trim(prefix[3:])
 			varNames := []string{""}
-			for key := range s.Env.Storage {
+			for key := range s.Env.Data {
 				if prefix == "" || strings.HasPrefix(key, prefix) == true {
 					varNames = append(varNames, key)
 				}