diff --git a/checkpoint.go b/checkpoint.go
index ecf89ea11..d659577cb 100644
--- a/checkpoint.go
+++ b/checkpoint.go
@@ -54,13 +54,13 @@ func setPageServer(context *cli.Context, options *libcontainer.CriuOpts) {
 		if len(addressPort) != 2 {
 			fatal(fmt.Errorf("Use --page-server ADDRESS:PORT to specify page server"))
 		}
-		port_int, err := strconv.Atoi(addressPort[1])
+		portInt, err := strconv.Atoi(addressPort[1])
 		if err != nil {
 			fatal(fmt.Errorf("Invalid port number"))
 		}
 		options.PageServer = libcontainer.CriuPageServerInfo{
 			Address: addressPort[0],
-			Port:    int32(port_int),
+			Port:    int32(portInt),
 		}
 	}
 }
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
index 9a27eb432..54ba87e23 100644
--- a/libcontainer/container_linux.go
+++ b/libcontainer/container_linux.go
@@ -299,7 +299,7 @@ func (c *linuxContainer) checkCriuVersion() error {
 	return nil
 }
 
-const descriptors_filename = "descriptors.json"
+const descriptorsFilename = "descriptors.json"
 
 func (c *linuxContainer) addCriuDumpMount(req *criurpc.CriuReq, m *configs.Mount) {
 	mountDest := m.Destination
@@ -406,7 +406,7 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error {
 		return err
 	}
 
-	err = ioutil.WriteFile(filepath.Join(criuOpts.ImagesDirectory, descriptors_filename), fdsJSON, 0655)
+	err = ioutil.WriteFile(filepath.Join(criuOpts.ImagesDirectory, descriptorsFilename), fdsJSON, 0655)
 	if err != nil {
 		return err
 	}
@@ -538,7 +538,7 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error {
 		fdJSON []byte
 	)
 
-	if fdJSON, err = ioutil.ReadFile(filepath.Join(criuOpts.ImagesDirectory, descriptors_filename)); err != nil {
+	if fdJSON, err = ioutil.ReadFile(filepath.Join(criuOpts.ImagesDirectory, descriptorsFilename)); err != nil {
 		return err
 	}
 
diff --git a/spec.go b/spec.go
index 2a025cd21..4ce23475c 100644
--- a/spec.go
+++ b/spec.go
@@ -333,17 +333,17 @@ func setupUserNamespace(spec *specs.LinuxSpec, config *configs.Config) error {
 	for _, m := range spec.Linux.GIDMappings {
 		config.GidMappings = append(config.GidMappings, create(m))
 	}
-	rootUid, err := config.HostUID()
+	rootUID, err := config.HostUID()
 	if err != nil {
 		return err
 	}
-	rootGid, err := config.HostGID()
+	rootGID, err := config.HostGID()
 	if err != nil {
 		return err
 	}
 	for _, node := range config.Devices {
-		node.Uid = uint32(rootUid)
-		node.Gid = uint32(rootGid)
+		node.Uid = uint32(rootUID)
+		node.Gid = uint32(rootGID)
 	}
 	return nil
 }