diff --git a/openstack/compute/v2/servers/results.go b/openstack/compute/v2/servers/results.go
index c3e41d7..74a221f 100644
--- a/openstack/compute/v2/servers/results.go
+++ b/openstack/compute/v2/servers/results.go
@@ -101,11 +101,11 @@
 	Links []interface{}
 
 	// KeyName indicates which public key was injected into the server on launch.
-	KeyName string `mapstructure:"keyname"`
+	KeyName string `json:"key_name" mapstructure:"key_name"`
 
 	// AdminPass will generally be empty ("").  However, it will contain the administrative password chosen when provisioning a new server without a set AdminPass setting in the first place.
 	// Note that this is the ONLY time this field will be valid.
-	AdminPass string `mapstructure:"adminPass"`
+	AdminPass string `json:"adminPass" mapstructure:"adminPass"`
 }
 
 // ServerPage abstracts the raw results of making a List() request against the API.