diff --git a/README.md b/README.md
index babb1675e..9f0f2e658 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 ## Minio Server [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/minio/minio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Minio is a minimal object storage server written in Golang and licensed under [Apache license v2](./LICENSE). Minio is compatible with Amazon S3 APIs. [![Build Status](https://travis-ci.org/minio/minio.svg?branch=master)](https://travis-ci.org/minio/minio)
+Minio is a minimal cloud storage server written in Golang and licensed under [Apache license v2](./LICENSE). Minio is compatible with Amazon S3 APIs. [![Build Status](https://travis-ci.org/minio/minio.svg?branch=master)](https://travis-ci.org/minio/minio)
 
 ## Minio Client
 
-[Minio Client (mc)](https://github.com/minio/mc#minio-client-mc-) provides a modern alternative to Unix commands like ``ls``, ``cat``, ``cp``, ``sync``, and ``diff``. It supports POSIX compatible filesystems and Amazon S3 compatible object storage systems. It is entirely written in Golang. 
+[Minio Client (mc)](https://github.com/minio/mc#minio-client-mc-) provides a modern alternative to Unix commands like ``ls``, ``cat``, ``cp``, ``sync``, and ``diff``. It supports POSIX compatible filesystems and Amazon S3 compatible cloud storage systems. It is entirely written in Golang.
 
 ## Amazon S3 Compatible Client Libraries
 - [Golang Library](https://github.com/minio/minio-go)
@@ -16,27 +16,27 @@ Minio is a minimal object storage server written in Golang and licensed under [A
 ~~~
 Storage Backend:
 - Donut: Erasure coded backend.
- - Status: Standalone mode complete. 
+ - Status: Standalone mode complete.
 Storage Operations:
 - Collective:
   - Status: Work in progress.
 
 Storage Management:
-- WebCLI: 
+- WebCLI:
   - Status: Work in progress.
 - Authentication:
   - Status: Work in progress.
 - Admin Console:
   - Status: Work in progress.
-- User Console: 
+- User Console:
   - Status: Work in progress.
-- Logging: 
+- Logging:
   - Status: Work in progress.
 ~~~
 
 ### Install
 
-#### GNU/Linux 
+#### GNU/Linux
 
 Download ``minio`` from https://dl.minio.io:9000/updates/2015/Jun/linux-amd64/minio
 
diff --git a/doc.go b/doc.go
index 2a16d0f9b..06b0ce4d3 100644
--- a/doc.go
+++ b/doc.go
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-// Minio - Object storage inspired by Amazon S3 and Facebook Haystack.
+// Minio Cloud Storage
 package main
diff --git a/main.go b/main.go
index b9dde4e6d..da293b7b9 100644
--- a/main.go
+++ b/main.go
@@ -35,7 +35,7 @@ var flags = []cli.Flag{
 	cli.StringFlag{
 		Name:  "address",
 		Value: ":9000",
-		Usage: "ADDRESS:PORT for object storage access",
+		Usage: "ADDRESS:PORT for cloud storage access",
 	},
 	cli.StringFlag{
 		Name:  "address-mgmt",
diff --git a/pkg/donut/interfaces.go b/pkg/donut/interfaces.go
index 47ce03f14..5f0ae65e6 100644
--- a/pkg/donut/interfaces.go
+++ b/pkg/donut/interfaces.go
@@ -20,14 +20,14 @@ import "io"
 
 // Collection of Donut specification interfaces
 
-// Interface is a collection of object storage and management interface
+// Interface is a collection of cloud storage and management interface
 type Interface interface {
-	ObjectStorage
+	CloudStorage
 	Management
 }
 
-// ObjectStorage is a donut object storage interface
-type ObjectStorage interface {
+// CloudStorage is a donut cloud storage interface
+type CloudStorage interface {
 	// Storage service operations
 	GetBucketMetadata(bucket string, signature *Signature) (BucketMetadata, error)
 	SetBucketMetadata(bucket string, metadata map[string]string, signature *Signature) error
diff --git a/pkg/erasure/ec_minio_common.h b/pkg/erasure/ec_minio_common.h
index 75f4cbc16..f55897a4c 100644
--- a/pkg/erasure/ec_minio_common.h
+++ b/pkg/erasure/ec_minio_common.h
@@ -1,5 +1,5 @@
 /*
- * Mini Object Storage, (C) 2014 Minio, Inc.
+ * Minio Cloud Storage, (C) 2014 Minio, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pkg/server/api/definitions.go b/pkg/server/api/definitions.go
index d8ac32679..ecbf8b310 100644
--- a/pkg/server/api/definitions.go
+++ b/pkg/server/api/definitions.go
@@ -53,7 +53,7 @@ type ListObjectsResponse struct {
 
 	// When response is truncated (the IsTruncated element value in the response
 	// is true), you can use the key name in this field as marker in the subsequent
-	// request to get next set of objects. Object storage lists objects in alphabetical
+	// request to get next set of objects. Server lists objects in alphabetical
 	// order Note: This element is returned only if you have delimiter request parameter
 	// specified. If response does not include the NextMaker and it is truncated,
 	// you can use the value of the last Key in the response as the marker in the
diff --git a/pkg/server/signature-v4_test.go b/pkg/server/signature-v4_test.go
index 234db761e..d2cee4511 100644
--- a/pkg/server/signature-v4_test.go
+++ b/pkg/server/signature-v4_test.go
@@ -1,5 +1,5 @@
 /*
- * Minimal object storage library (C) 2015 Minio, Inc.
+ * Minio Cloud Storage, (C) 2014 Minio, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.