diff --git a/hooks/Config_ProactiveEvaluation/README.md b/hooks/Config_ProactiveEvaluation/README.md
index 5ba3e08e..3690da43 100644
--- a/hooks/Config_ProactiveEvaluation/README.md
+++ b/hooks/Config_ProactiveEvaluation/README.md
@@ -1,4 +1,4 @@
-# AWSSamples::ConfigProactiveEval::Hook
+# AwsCommunity::Config::ProactiveEval
 
 - [Overview](#overview)
 
diff --git a/hooks/Config_ProactiveEvaluation/hook/.rpdk-config b/hooks/Config_ProactiveEvaluation/hook/.rpdk-config
index a6cf3725..1bd9eee7 100644
--- a/hooks/Config_ProactiveEvaluation/hook/.rpdk-config
+++ b/hooks/Config_ProactiveEvaluation/hook/.rpdk-config
@@ -1,10 +1,10 @@
 {
     "artifact_type": "HOOK",
-    "typeName": "AWSSamples::ConfigProactiveEval::Hook",
+    "typeName": "AwsCommunity::Config::ProactiveEval",
     "language": "java",
     "runtime": "java11",
-    "entrypoint": "com.awssamples.configproactiveeval.hook.HookHandlerWrapper::handleRequest",
-    "testEntrypoint": "com.awssamples.configproactiveeval.hook.HookHandlerWrapper::testEntrypoint",
+    "entrypoint": "com.awscommunity.config.proactiveeval.HookHandlerWrapper::handleRequest",
+    "testEntrypoint": "com.awscommunity.config.proactiveeval.HookHandlerWrapper::testEntrypoint",
     "settings": {
         "version": false,
         "subparser_name": null,
@@ -18,12 +18,12 @@
         "profile": null,
         "namespace": [
             "com",
-            "awssamples",
-            "configproactiveeval",
-            "hook"
+            "awscommunity",
+            "config",
+            "proactiveeval"
         ],
         "codegen_template_path": "guided_aws",
         "protocolVersion": "2.0.0"
     },
-    "executableEntrypoint": "com.awssamples.configproactiveeval.hook.HookHandlerWrapperExecutable"
+    "executableEntrypoint": "com.awscommunity.config.proactiveeval.HookHandlerWrapperExecutable"
 }
diff --git a/hooks/Config_ProactiveEvaluation/hook/awssamples-configproactiveeval-hook.json b/hooks/Config_ProactiveEvaluation/hook/awscommunity-config-proactiveeval.json
similarity index 93%
rename from hooks/Config_ProactiveEvaluation/hook/awssamples-configproactiveeval-hook.json
rename to hooks/Config_ProactiveEvaluation/hook/awscommunity-config-proactiveeval.json
index a1361de0..dc7c03c0 100644
--- a/hooks/Config_ProactiveEvaluation/hook/awssamples-configproactiveeval-hook.json
+++ b/hooks/Config_ProactiveEvaluation/hook/awscommunity-config-proactiveeval.json
@@ -1,6 +1,6 @@
 {
-    "typeName": "AWSSamples::ConfigProactiveEval::Hook",
-    "description": "Sample hook to call AWS Config proactive evaluations",
+    "typeName": "AwsCommunity::Config::ProactiveEval",
+    "description": "This hook calls AWS Config proactive evaluations to assess compliance of the resource",
     "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-samples/",
     "documentationUrl": "https://github.com/aws-cloudformation/aws-cloudformation-samples/",
     "typeConfiguration": {
diff --git a/hooks/Config_ProactiveEvaluation/hook/hook-role.yaml b/hooks/Config_ProactiveEvaluation/hook/hook-role.yaml
index 141d1247..11a34242 100644
--- a/hooks/Config_ProactiveEvaluation/hook/hook-role.yaml
+++ b/hooks/Config_ProactiveEvaluation/hook/hook-role.yaml
@@ -23,7 +23,7 @@ Resources:
                   Ref: AWS::AccountId
               StringLike:
                 aws:SourceArn:
-                  Fn::Sub: arn:${AWS::Partition}:cloudformation:${AWS::Region}:${AWS::AccountId}:type/hook/AWSSamples-ConfigProactiveEval-Hook/*
+                  Fn::Sub: arn:${AWS::Partition}:cloudformation:${AWS::Region}:${AWS::AccountId}:type/hook/AwsCommunity-Config-ProactiveEval/*
       Path: "/"
       Policies:
         - PolicyName: HookTypePolicy
diff --git a/hooks/Config_ProactiveEvaluation/hook/pom.xml b/hooks/Config_ProactiveEvaluation/hook/pom.xml
index f1dd0da3..e4b7a3be 100644
--- a/hooks/Config_ProactiveEvaluation/hook/pom.xml
+++ b/hooks/Config_ProactiveEvaluation/hook/pom.xml
@@ -5,9 +5,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.awssamples.configproactiveeval.hook</groupId>
-    <artifactId>awssamples-configproactiveeval-hook-handler</artifactId>
-    <name>awssamples-configproactiveeval-hook-handler</name>
+    <groupId>com.awscommunity.config.proactiveeval</groupId>
+    <artifactId>awscommunity-config-proactiveeval-handler</artifactId>
+    <name>awscommunity-config-proactiveeval-handler</name>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
@@ -239,7 +239,7 @@
             <resource>
                 <directory>${project.basedir}</directory>
                 <includes>
-                    <include>awssamples-configproactiveeval-hook.json</include>
+                    <include>awscommunity-config-proactiveeval.json</include>
                 </includes>
             </resource>
             <resource>
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/BaseHookHandlerStd.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/BaseHookHandlerStd.java
similarity index 98%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/BaseHookHandlerStd.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/BaseHookHandlerStd.java
index 55a0e76a..94370240 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/BaseHookHandlerStd.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/BaseHookHandlerStd.java
@@ -1,6 +1,7 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import software.amazon.awssdk.services.config.model.InvalidParameterValueException;
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/CallbackContext.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/CallbackContext.java
similarity index 84%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/CallbackContext.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/CallbackContext.java
index 1d40688f..b10c18d8 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/CallbackContext.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/CallbackContext.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import software.amazon.cloudformation.proxy.StdCallbackContext;
 
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/ClientBuilder.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/ClientBuilder.java
similarity index 89%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/ClientBuilder.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/ClientBuilder.java
index 58e405c4..b42d86fd 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/ClientBuilder.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/ClientBuilder.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import software.amazon.awssdk.services.config.ConfigClient;
 import software.amazon.cloudformation.HookLambdaWrapper;
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/Configuration.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/Configuration.java
similarity index 64%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/Configuration.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/Configuration.java
index 068d7c3a..380fefff 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/Configuration.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/Configuration.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 /**
  * Handle the configuration.
@@ -9,6 +9,6 @@ class Configuration extends BaseHookConfiguration {
    * Initialize with the hook schema configuration file.
    */
   public Configuration() {
-    super("awssamples-configproactiveeval-hook.json");
+    super("awscommunity-config-proactiveeval.json");
   }
 }
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/PreCreateHookHandler.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/PreCreateHookHandler.java
similarity index 94%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/PreCreateHookHandler.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/PreCreateHookHandler.java
index 978fb995..4c7859eb 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/PreCreateHookHandler.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/PreCreateHookHandler.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
 import software.amazon.cloudformation.proxy.Logger;
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/PreUpdateHookHandler.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/PreUpdateHookHandler.java
similarity index 94%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/PreUpdateHookHandler.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/PreUpdateHookHandler.java
index 3253662a..3701563d 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/PreUpdateHookHandler.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/PreUpdateHookHandler.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import software.amazon.cloudformation.proxy.AmazonWebServicesClientProxy;
 import software.amazon.cloudformation.proxy.Logger;
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/ProactiveComplianceHandler.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/ProactiveComplianceHandler.java
similarity index 99%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/ProactiveComplianceHandler.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/ProactiveComplianceHandler.java
index 02e90315..b748023e 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/ProactiveComplianceHandler.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/ProactiveComplianceHandler.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/RequestBuilders.java b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/RequestBuilders.java
similarity index 97%
rename from hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/RequestBuilders.java
rename to hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/RequestBuilders.java
index 07820e79..5b431046 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awssamples/configproactiveeval/hook/RequestBuilders.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/main/java/com/awscommunity/config/proactiveeval/RequestBuilders.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import software.amazon.awssdk.services.config.model.EvaluationMode;
 import software.amazon.awssdk.services.config.model.GetResourceEvaluationSummaryRequest;
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/BaseHookHandlerStdTest.java b/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/BaseHookHandlerStdTest.java
similarity index 99%
rename from hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/BaseHookHandlerStdTest.java
rename to hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/BaseHookHandlerStdTest.java
index b1da1a04..624801ba 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/BaseHookHandlerStdTest.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/BaseHookHandlerStdTest.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/PreCreateHookHandlerTest.java b/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/PreCreateHookHandlerTest.java
similarity index 96%
rename from hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/PreCreateHookHandlerTest.java
rename to hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/PreCreateHookHandlerTest.java
index b4e47004..c64edacb 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/PreCreateHookHandlerTest.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/PreCreateHookHandlerTest.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import static org.mockito.Mockito.spy;
 
diff --git a/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/PreUpdateHookHandlerTest.java b/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/PreUpdateHookHandlerTest.java
similarity index 96%
rename from hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/PreUpdateHookHandlerTest.java
rename to hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/PreUpdateHookHandlerTest.java
index 3a307ce6..393bff53 100644
--- a/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awssamples/configproactiveeval/hook/PreUpdateHookHandlerTest.java
+++ b/hooks/Config_ProactiveEvaluation/hook/src/test/java/com/awscommunity/config/proactiveeval/PreUpdateHookHandlerTest.java
@@ -1,4 +1,4 @@
-package com.awssamples.configproactiveeval.hook;
+package com.awscommunity.config.proactiveeval;
 
 import static org.mockito.Mockito.spy;
 
diff --git a/hooks/Config_ProactiveEvaluation/hook/template.yml b/hooks/Config_ProactiveEvaluation/hook/template.yml
index 2a1a2dde..79793e86 100644
--- a/hooks/Config_ProactiveEvaluation/hook/template.yml
+++ b/hooks/Config_ProactiveEvaluation/hook/template.yml
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: "2010-09-09"
 Transform: AWS::Serverless-2016-10-31
-Description: AWS SAM template for the AWSSamples::ConfigProactiveEval::Hook resource type
+Description: AWS SAM template for the AwsCommunity::Config::ProactiveEval resource type
 
 Globals:
   Function:
@@ -11,13 +11,13 @@ Resources:
   TypeFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: com.awssamples.configproactiveeval.hook.HookHandlerWrapper::handleRequest
+      Handler: com.awscommunity.config.proactiveeval.HookHandlerWrapper::handleRequest
       Runtime: java11
-      CodeUri: ./target/awssamples-configproactiveeval-hook-handler-1.0-SNAPSHOT.jar
+      CodeUri: ./target/awscommunity-config-proactiveeval-handler-1.0-SNAPSHOT.jar
 
   TestEntrypoint:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: com.awssamples.configproactiveeval.hook.HookHandlerWrapper::testEntrypoint
+      Handler: com.awscommunity.config.proactiveeval.HookHandlerWrapper::testEntrypoint
       Runtime: java11
-      CodeUri: ./target/awssamples-configproactiveeval-hook-handler-1.0-SNAPSHOT.jar
\ No newline at end of file
+      CodeUri: ./target/awscommunity-config-proactiveeval-handler-1.0-SNAPSHOT.jar
\ No newline at end of file