diff --git a/cmd/api-datatypes.go b/cmd/api-datatypes.go
index b86b15a20..2d2831ca1 100644
--- a/cmd/api-datatypes.go
+++ b/cmd/api-datatypes.go
@@ -67,7 +67,7 @@ type ObjectToDelete struct {
 	ReplicateDecisionStr string `xml:"-"`
 }
 
-// createBucketConfiguration container for bucket configuration request from client.
+// createBucketLocationConfiguration container for bucket configuration request from client.
 // Used for parsing the location from the request body for Makebucket.
 type createBucketLocationConfiguration struct {
 	XMLName  xml.Name `xml:"CreateBucketConfiguration" json:"-"`
diff --git a/cmd/api-router.go b/cmd/api-router.go
index 6943ed423..a54761f5e 100644
--- a/cmd/api-router.go
+++ b/cmd/api-router.go
@@ -64,7 +64,7 @@ func setObjectLayer(o ObjectLayer) {
 	globalObjLayerMutex.Unlock()
 }
 
-// objectAPIHandler implements and provides http handlers for S3 API.
+// objectAPIHandlers implements and provides http handlers for S3 API.
 type objectAPIHandlers struct {
 	ObjectAPI func() ObjectLayer
 }