diff --git a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/IcebergCatalogBackend.java b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/IcebergCatalogBackend.java
index d8b3dd2fcee..21e0122a039 100644
--- a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/IcebergCatalogBackend.java
+++ b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/IcebergCatalogBackend.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Datastrato Pvt Ltd.
+ * Copyright 2023 Datastrato Pvt Ltd.
  * This software is licensed under the Apache License version 2.
  */
 package com.datastrato.gravitino.iceberg.common;
diff --git a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/ops/IcebergTableOps.java b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/ops/IcebergTableOps.java
index a00a1038fa7..a4882d5cb86 100644
--- a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/ops/IcebergTableOps.java
+++ b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/ops/IcebergTableOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Datastrato Pvt Ltd.
+ * Copyright 2023 Datastrato Pvt Ltd.
  * This software is licensed under the Apache License version 2.
  */
 package com.datastrato.gravitino.iceberg.common.ops;
diff --git a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergCatalogUtil.java b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergCatalogUtil.java
index 97afc3f7b02..5507a91c3e4 100644
--- a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergCatalogUtil.java
+++ b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergCatalogUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Datastrato Pvt Ltd.
+ * Copyright 2023 Datastrato Pvt Ltd.
  * This software is licensed under the Apache License version 2.
  */
 package com.datastrato.gravitino.iceberg.common.utils;
diff --git a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergHiveCachedClientPool.java b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergHiveCachedClientPool.java
index 935bf00c4e8..44a4dbd47a8 100644
--- a/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergHiveCachedClientPool.java
+++ b/iceberg-common/src/main/java/com/datastrato/gravitino/iceberg/common/utils/IcebergHiveCachedClientPool.java
@@ -1,6 +1,20 @@
 /*
- * Copyright 2024 Datastrato Pvt Ltd.
- * This software is licensed under the Apache License version 2.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package com.datastrato.gravitino.iceberg.common.utils;
diff --git a/iceberg-common/src/test/java/com/datastrato/gravitino/common/TestIcebergConfig.java b/iceberg-common/src/test/java/com/datastrato/gravitino/iceberg/common/TestIcebergConfig.java
similarity index 98%
rename from iceberg-common/src/test/java/com/datastrato/gravitino/common/TestIcebergConfig.java
rename to iceberg-common/src/test/java/com/datastrato/gravitino/iceberg/common/TestIcebergConfig.java
index 9bd76d17c42..0d197d48800 100644
--- a/iceberg-common/src/test/java/com/datastrato/gravitino/common/TestIcebergConfig.java
+++ b/iceberg-common/src/test/java/com/datastrato/gravitino/iceberg/common/TestIcebergConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Datastrato Pvt Ltd.
+ * Copyright 2023 Datastrato Pvt Ltd.
  * This software is licensed under the Apache License version 2.
  */
 
diff --git a/iceberg-common/src/test/java/com/datastrato/gravitino/common/utils/TestIcebergCatalogUtil.java b/iceberg-common/src/test/java/com/datastrato/gravitino/iceberg/common/utils/TestIcebergCatalogUtil.java
similarity index 81%
rename from iceberg-common/src/test/java/com/datastrato/gravitino/common/utils/TestIcebergCatalogUtil.java
rename to iceberg-common/src/test/java/com/datastrato/gravitino/iceberg/common/utils/TestIcebergCatalogUtil.java
index 0bf6c6d5d77..d264d8e3d88 100644
--- a/iceberg-common/src/test/java/com/datastrato/gravitino/common/utils/TestIcebergCatalogUtil.java
+++ b/iceberg-common/src/test/java/com/datastrato/gravitino/iceberg/common/utils/TestIcebergCatalogUtil.java
@@ -5,8 +5,8 @@
 
 package com.datastrato.gravitino.iceberg.common.utils;
 
-import com.datastrato.gravitino.catalog.lakehouse.iceberg.IcebergCatalogPropertiesMetadata;
 import com.datastrato.gravitino.iceberg.common.IcebergConfig;
+import com.datastrato.gravitino.iceberg.common.IcebergConstants;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.iceberg.CatalogProperties;
@@ -48,10 +48,10 @@ void testLoadCatalog() {
     Map<String, String> properties = new HashMap<>();
     properties.put(CatalogProperties.URI, "jdbc://0.0.0.0:3306");
     properties.put(CatalogProperties.WAREHOUSE_LOCATION, "test");
-    properties.put(IcebergCatalogPropertiesMetadata.GRAVITINO_JDBC_DRIVER, "org.sqlite.JDBC");
-    properties.put(IcebergCatalogPropertiesMetadata.ICEBERG_JDBC_USER, "test");
-    properties.put(IcebergCatalogPropertiesMetadata.ICEBERG_JDBC_PASSWORD, "test");
-    properties.put(IcebergCatalogPropertiesMetadata.ICEBERG_JDBC_INITIALIZE, "false");
+    properties.put(IcebergConstants.GRAVITINO_JDBC_DRIVER, "org.sqlite.JDBC");
+    properties.put(IcebergConstants.ICEBERG_JDBC_USER, "test");
+    properties.put(IcebergConstants.ICEBERG_JDBC_PASSWORD, "test");
+    properties.put(IcebergConstants.ICEBERG_JDBC_INITIALIZE, "false");
     catalog = IcebergCatalogUtil.loadCatalogBackend("jdbc", properties);
     Assertions.assertTrue(catalog instanceof JdbcCatalog);