diff --git a/service/gcs/bridge/bridge.go b/service/gcs/bridge/bridge.go
index d11485c9..f52c856b 100644
--- a/service/gcs/bridge/bridge.go
+++ b/service/gcs/bridge/bridge.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 
 	"github.com/Microsoft/opengcs/service/gcs/core"
-	gcserr "github.com/Microsoft/opengcs/service/gcs/errors"
+	"github.com/Microsoft/opengcs/service/gcs/gcserr"
 	"github.com/Microsoft/opengcs/service/gcs/oslayer"
 	"github.com/Microsoft/opengcs/service/gcs/prot"
 	"github.com/Microsoft/opengcs/service/gcs/transport"
diff --git a/service/gcs/bridge/bridge_unit_test.go b/service/gcs/bridge/bridge_unit_test.go
index e6627e82..08ebe7d8 100644
--- a/service/gcs/bridge/bridge_unit_test.go
+++ b/service/gcs/bridge/bridge_unit_test.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"testing"
 
-	gcserr "github.com/Microsoft/opengcs/service/gcs/errors"
+	"github.com/Microsoft/opengcs/service/gcs/gcserr"
 	"github.com/Microsoft/opengcs/service/gcs/prot"
 	"github.com/Microsoft/opengcs/service/gcs/transport"
 	"github.com/pkg/errors"
diff --git a/service/gcs/core/gcs/gcs.go b/service/gcs/core/gcs/gcs.go
index 27f6991c..5518922a 100644
--- a/service/gcs/core/gcs/gcs.go
+++ b/service/gcs/core/gcs/gcs.go
@@ -12,7 +12,7 @@ import (
 	"syscall"
 
 	"github.com/Microsoft/opengcs/service/gcs/core"
-	gcserr "github.com/Microsoft/opengcs/service/gcs/errors"
+	"github.com/Microsoft/opengcs/service/gcs/gcserr"
 	"github.com/Microsoft/opengcs/service/gcs/oslayer"
 	"github.com/Microsoft/opengcs/service/gcs/prot"
 	"github.com/Microsoft/opengcs/service/gcs/runtime"
diff --git a/service/gcs/errors/errors.go b/service/gcs/gcserr/errors.go
similarity index 99%
rename from service/gcs/errors/errors.go
rename to service/gcs/gcserr/errors.go
index de51afe2..15ad76be 100644
--- a/service/gcs/errors/errors.go
+++ b/service/gcs/gcserr/errors.go
@@ -1,4 +1,4 @@
-package errors
+package gcserr
 
 import (
 	"fmt"
diff --git a/service/gcs/errors/errors_suite_test.go b/service/gcs/gcserr/errors_suite_test.go
similarity index 95%
rename from service/gcs/errors/errors_suite_test.go
rename to service/gcs/gcserr/errors_suite_test.go
index d68a4cb1..27b3a877 100644
--- a/service/gcs/errors/errors_suite_test.go
+++ b/service/gcs/gcserr/errors_suite_test.go
@@ -1,12 +1,12 @@
-package errors
+package gcserr
 
 import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/sirupsen/logrus"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/sirupsen/logrus"
 )
 
 func TestErrors(t *testing.T) {
diff --git a/service/gcs/errors/errors_test.go b/service/gcs/gcserr/errors_test.go
similarity index 99%
rename from service/gcs/errors/errors_test.go
rename to service/gcs/gcserr/errors_test.go
index 1b550b37..34a65f62 100644
--- a/service/gcs/errors/errors_test.go
+++ b/service/gcs/gcserr/errors_test.go
@@ -1,4 +1,4 @@
-package errors
+package gcserr
 
 import (
 	"fmt"
diff --git a/service/libs/commonutils/utilities.go b/service/libs/commonutils/utilities.go
index 96d13430..adfdbc59 100644
--- a/service/libs/commonutils/utilities.go
+++ b/service/libs/commonutils/utilities.go
@@ -4,9 +4,8 @@ import (
 	"encoding/json"
 	"io"
 
+	"github.com/Microsoft/opengcs/service/gcs/gcserr"
 	"github.com/pkg/errors"
-
-	gcserr "github.com/Microsoft/opengcs/service/gcs/errors"
 )
 
 // UnmarshalJSONWithHresult unmarshals the given data into the given interface, and