@@ -88,7 +88,7 @@ type CommonConfig struct {

 	Root                 string              `json:"graph,omitempty"`

 	SocketGroup          string              `json:"group,omitempty"`

 	TrustKeyPath         string              `json:"-"`

-	CorsHeaders          string              `json:"api-cors-headers,omitempty"`

+	CorsHeaders          string              `json:"api-cors-header,omitempty"`

 	EnableCors           bool                `json:"api-enable-cors,omitempty"`

 	// ClusterStore is the storage backend used for the cluster information. It is used by both

@@ -41,7 +41,7 @@ type bridgeConfig struct {

 	EnableIPv6                  bool   `json:"ipv6,omitempty"`

 	EnableIPTables              bool   `json:"iptables,omitempty"`

 	EnableIPForward             bool   `json:"ip-forward,omitempty"`

-	EnableIPMasq                bool   `json:"ip-mask,omitempty"`

+	EnableIPMasq                bool   `json:"ip-masq,omitempty"`

 	EnableUserlandProxy         bool   `json:"userland-proxy,omitempty"`

 	DefaultIP                   net.IP `json:"ip,omitempty"`

 	IP                          string `json:"bip,omitempty"`

@@ -939,7 +939,7 @@ This is a full example of the allowed configuration options in the file:

 	"tlscacert": "",

 	"tlscert": "",

 	"tlskey": "",

-	"api-cors-headers": "",

+	"api-cors-header": "",

 	"selinux-enabled": false,

 	"userns-remap": "",

 	"group": "",

@@ -948,7 +948,7 @@ This is a full example of the allowed configuration options in the file:

 	"ipv6": false,

 	"iptables": false,

 	"ip-forward": false,

-	"ip-mask": false,

+	"ip-masq": false,

 	"userland-proxy": false,

 	"ip": "0.0.0.0",

 	"bridge": "",