diff --git a/app/handler/file.go b/app/handler/file.go
index 5374cc9..0ecb302 100644
--- a/app/handler/file.go
+++ b/app/handler/file.go
@@ -21,8 +21,9 @@ func (hand *Handler) FileExists(rctx *router.Context) {
 		rctx.SetStatus(code)
 		return
 	}
+	// TODO
 	rctx.SetHeader("X-Content-Type", res.ContentType)
-	rctx.SetHeader("X-Content-Size", res.ContentSize)
+	rctx.SetHeader("X-Content-Length", res.ContentLength)
 	rctx.SetHeader("X-Content-Digest", res.ContentDigest)
 	rctx.SetHeader("Content-Length", "0")
 	rctx.SetStatus(code)
@@ -31,17 +32,17 @@ func (hand *Handler) FileExists(rctx *router.Context) {
 func (hand *Handler) PutFile(rctx *router.Context) {
 	hand.logg.Debugf("Handle PutFile")
 
-	contentSize := rctx.GetHeader("Content-Size")
+	contentLength := rctx.GetHeader("Content-Length")
 	contentType := rctx.GetHeader("Content-Type")
 	filepath := rctx.PathMap["filepath"]
 
-	hand.logg.Debugf("%s", contentSize)
+	hand.logg.Debugf("Content-Length=%s", rctx.GetHeader("Content-Length"))
 
 	params := &operator.PutFileParams{
-		Filepath:    filepath,
-		ContentSize: contentSize,
-		ContentType: contentType,
-		Source:      rctx.Request.Body,
+		Filepath:      filepath,
+		ContentLength: contentLength,
+		ContentType:   contentType,
+		Source:        rctx.Request.Body,
 	}
 	code, _, err := hand.oper.PutFile(params)
 	if err != nil {
@@ -69,7 +70,7 @@ func (hand *Handler) GetFile(rctx *router.Context) {
 	}
 
 	rctx.SetHeader("Content-Type", res.ContentType)
-	rctx.SetHeader("Content-Length", res.ContentSize)
+	rctx.SetHeader("Content-Length", res.ContentLength)
 	rctx.SetHeader("Content-Digest", res.ContentDigest)
 	rctx.SetStatus(code)
 
diff --git a/app/operator/file.go b/app/operator/file.go
index 03b8bf7..34f7a6a 100644
--- a/app/operator/file.go
+++ b/app/operator/file.go
@@ -21,7 +21,7 @@ type FileExistsParams struct {
 }
 type FileExistsResult struct {
 	ContentType   string
-	ContentSize   string
+	ContentLength string
 	ContentDigest string
 }
 
@@ -54,7 +54,7 @@ func (oper *Operator) FileExists(param *FileExistsParams) (int, *FileExistsResul
 		return code, res, err
 	}
 	res = &FileExistsResult{
-		ContentSize:   strconv.FormatInt(fileDescr.Size, 10),
+		ContentLength: strconv.FormatInt(fileDescr.Size, 10),
 		ContentType:   fileDescr.Type,
 		ContentDigest: fileDescr.Checksum,
 	}
@@ -63,10 +63,10 @@ func (oper *Operator) FileExists(param *FileExistsParams) (int, *FileExistsResul
 
 // PutFile
 type PutFileParams struct {
-	ContentType string
-	ContentSize string
-	Filepath    string
-	Source      io.ReadCloser
+	ContentType   string
+	ContentLength string
+	Filepath      string
+	Source        io.ReadCloser
 }
 type PutFileResult struct{}
 
@@ -76,12 +76,12 @@ func (oper *Operator) PutFile(param *PutFileParams) (int, *PutFileResult, error)
 	var err error
 	res := &PutFileResult{}
 
-	if param.ContentSize == "" {
+	if param.ContentLength == "" {
 		code := http.StatusLengthRequired
-		err = fmt.Errorf("Content-Size is empty")
+		err = fmt.Errorf("Content-Length is empty")
 		return code, res, err
 	}
-	size, err := strconv.ParseInt(param.ContentSize, 10, 64)
+	size, err := strconv.ParseInt(param.ContentLength, 10, 64)
 	if err != nil {
 		code := http.StatusLengthRequired
 		return code, res, err
@@ -158,7 +158,7 @@ type GetFileParams struct {
 }
 type GetFileResult struct {
 	ContentType   string
-	ContentSize   string
+	ContentLength string
 	ContentDigest string
 	Source        io.ReadCloser
 }
@@ -194,7 +194,7 @@ func (oper *Operator) GetFile(param *GetFileParams) (int, *GetFileResult, error)
 		return code, res, err
 	}
 	res = &GetFileResult{
-		ContentSize:   strconv.FormatInt(fileDescr.Size, 10),
+		ContentLength: strconv.FormatInt(fileDescr.Size, 10),
 		ContentType:   fileDescr.Type,
 		ContentDigest: fileDescr.Checksum,
 		Source:        reader,
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 173e83d..4779065 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -157,8 +157,8 @@ func (cli *Client) PutFile(ctx context.Context, filename, ref string) error {
 	}
 	filesize := fileinfo.Size()
 
+	req.ContentLength = filesize
 	req.Header.Set("Content-Type", "application/octet-stream")
-	req.Header.Set("Content-Size", strconv.FormatInt(filesize, 10))
 
 	resp, err := client.Do(req)
 	if err != nil {