diff --git a/cmd/katib-controller/v1beta1/main.go b/cmd/katib-controller/v1beta1/main.go
index 4f99a920423..9992ae05b4f 100644
--- a/cmd/katib-controller/v1beta1/main.go
+++ b/cmd/katib-controller/v1beta1/main.go
@@ -37,7 +37,7 @@ import (
 
 	configv1beta1 "github.com/kubeflow/katib/pkg/apis/config/v1beta1"
 	apis "github.com/kubeflow/katib/pkg/apis/controller"
-	cert "github.com/kubeflow/katib/pkg/cert-generator/v1beta1"
+	cert "github.com/kubeflow/katib/pkg/certgenerator/v1beta1"
 	"github.com/kubeflow/katib/pkg/controller.v1beta1"
 	"github.com/kubeflow/katib/pkg/controller.v1beta1/consts"
 	"github.com/kubeflow/katib/pkg/util/v1beta1/katibconfig"
diff --git a/docs/developer-guide.md b/docs/developer-guide.md
index c0dc9e0adcf..09d4529753c 100644
--- a/docs/developer-guide.md
+++ b/docs/developer-guide.md
@@ -116,7 +116,7 @@ Once Katib is deployed in the Kubernetes cluster, the `cert-generator` follows t
 
 Once the `cert-generator` finished, the Katib controller starts to register controllers such as `experiment-controller` to the manager.
 
-You can find the `cert-generator` source code [here](../pkg/cert-generator/v1beta1).
+You can find the `cert-generator` source code [here](../pkg/certgenerator/v1beta1).
 
 ## Implement a new algorithm and use it in Katib
 
diff --git a/pkg/cert-generator/v1beta1/certificate.go b/pkg/certgenerator/v1beta1/certificate.go
similarity index 98%
rename from pkg/cert-generator/v1beta1/certificate.go
rename to pkg/certgenerator/v1beta1/certificate.go
index dc091a30384..19d07615f67 100644
--- a/pkg/cert-generator/v1beta1/certificate.go
+++ b/pkg/certgenerator/v1beta1/certificate.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta1
+package certgenerator
 
 import (
 	"bytes"
diff --git a/pkg/cert-generator/v1beta1/const.go b/pkg/certgenerator/v1beta1/const.go
similarity index 96%
rename from pkg/cert-generator/v1beta1/const.go
rename to pkg/certgenerator/v1beta1/const.go
index cda52c72df2..622e14170cf 100644
--- a/pkg/cert-generator/v1beta1/const.go
+++ b/pkg/certgenerator/v1beta1/const.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta1
+package certgenerator
 
 const (
 	Webhook        = "katib.kubeflow.org"
diff --git a/pkg/cert-generator/v1beta1/generator.go b/pkg/certgenerator/v1beta1/generator.go
similarity index 99%
rename from pkg/cert-generator/v1beta1/generator.go
rename to pkg/certgenerator/v1beta1/generator.go
index 044c8b656ef..a16cbce0305 100644
--- a/pkg/cert-generator/v1beta1/generator.go
+++ b/pkg/certgenerator/v1beta1/generator.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta1
+package certgenerator
 
 import (
 	"bytes"
diff --git a/pkg/cert-generator/v1beta1/generator_test.go b/pkg/certgenerator/v1beta1/generator_test.go
similarity index 99%
rename from pkg/cert-generator/v1beta1/generator_test.go
rename to pkg/certgenerator/v1beta1/generator_test.go
index dc7464f1f90..bae01701911 100644
--- a/pkg/cert-generator/v1beta1/generator_test.go
+++ b/pkg/certgenerator/v1beta1/generator_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta1
+package certgenerator
 
 import (
 	"context"
diff --git a/pkg/controller.v1beta1/consts/const.go b/pkg/controller.v1beta1/consts/const.go
index f8c8004d6cb..b64785c5244 100644
--- a/pkg/controller.v1beta1/consts/const.go
+++ b/pkg/controller.v1beta1/consts/const.go
@@ -46,11 +46,6 @@ const (
 	// suggestion client implementation in experiment controller.
 	ConfigExperimentSuggestionName = "experiment-suggestion-name"
 
-	// ConfigCertLocalFS is the config name which indicates if we
-	// should store the cert in file system.
-	// TODO (andreyvelich): Currently is is not possible to store webhook cert in the local file system
-	// ConfigCertLocalFS = "cert-local-filesystem"
-
 	// CertDir is the location saved certs for the webhooks.
 	CertDir = "/tmp/cert"