diff --git a/README.md b/README.md
index 042d61b10..737fab31a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Powertools is available in Maven Central. You can use your favourite dependency
 <dependencies>
     ...
     <dependency>
-        <groupId>software.aws.lambda</groupId>
+        <groupId>software.amazon.lambda</groupId>
         <artifactId>aws-lambda-powertools-java</artifactId>
         <version>YOUR_REQUIRED_VERSION</version>
     </dependency>
@@ -37,7 +37,7 @@ And configure the aspectj-maven-plugin to compile-time weave (CTW) the aws-lambd
                  <complianceLevel>1.8</complianceLevel>
                  <aspectLibraries>
                      <aspectLibrary>
-                         <groupId>software.aws.lambda</groupId>
+                         <groupId>software.amazon.lambda</groupId>
                          <artifactId>aws-lambda-powertools-java</artifactId>
                      </aspectLibrary>
                  </aspectLibraries>
@@ -59,7 +59,7 @@ repositories {
 }
 
 dependencies {
-    powertools 'software.aws.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
+    powertools 'software.amazon.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
 }
 ```
 
diff --git a/docs/content/index.mdx b/docs/content/index.mdx
index fb33801c5..8ee26a12e 100644
--- a/docs/content/index.mdx
+++ b/docs/content/index.mdx
@@ -14,7 +14,7 @@ Powertools is available in Maven Central. You can use your favourite dependency
 <dependencies>
     ...
     <dependency>
-        <groupId>software.aws.lambda</groupId>
+        <groupId>software.amazon.lambda</groupId>
         <artifactId>aws-lambda-powertools-java</artifactId>
         <version>YOUR_REQUIRED_VERSION</version>
     </dependency>
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    powertools 'software.aws.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
+    powertools 'software.amazon.lambda:aws-lambda-powertools-java:YOUR_REQUIRED_VERSION'
 }
 ```
 
diff --git a/example/HelloWorldFunction/pom.xml b/example/HelloWorldFunction/pom.xml
index 1bba403bc..e24058662 100644
--- a/example/HelloWorldFunction/pom.xml
+++ b/example/HelloWorldFunction/pom.xml
@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>software.aws.lambda</groupId>
+            <groupId>software.amazon.lambda</groupId>
             <artifactId>aws-lambda-powertools-java</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
@@ -65,7 +65,7 @@
                  <complianceLevel>${maven.compiler.target}</complianceLevel>
                  <aspectLibraries>
                      <aspectLibrary>
-                         <groupId>software.aws.lambda</groupId>
+                         <groupId>software.amazon.lambda</groupId>
                          <artifactId>aws-lambda-powertools-java</artifactId>
                      </aspectLibrary>
                  </aspectLibraries>
diff --git a/example/HelloWorldFunction/src/main/java/helloworld/App.java b/example/HelloWorldFunction/src/main/java/helloworld/App.java
index c1b7d254d..4b37db6b3 100644
--- a/example/HelloWorldFunction/src/main/java/helloworld/App.java
+++ b/example/HelloWorldFunction/src/main/java/helloworld/App.java
@@ -16,13 +16,13 @@
 import com.amazonaws.xray.entities.Entity;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import software.aws.lambda.logging.PowerLogger;
-import software.aws.lambda.logging.PowerToolsLogging;
-import software.aws.lambda.tracing.PowerToolTracing;
-import software.aws.lambda.tracing.PowerTracer;
+import software.amazon.lambda.logging.PowerLogger;
+import software.amazon.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerTracer;
 
-import static software.aws.lambda.tracing.PowerTracer.putMetadata;
-import static software.aws.lambda.tracing.PowerTracer.withEntitySubsegment;
+import static software.amazon.lambda.tracing.PowerTracer.putMetadata;
+import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment;
 
 /**
  * Handler for requests to Lambda function.
diff --git a/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java b/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java
index 74b1381dc..b752f0c05 100644
--- a/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java
+++ b/example/HelloWorldFunction/src/main/java/helloworld/AppStream.java
@@ -8,7 +8,7 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import software.aws.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.logging.PowerToolsLogging;
 
 public class AppStream implements RequestStreamHandler {
     private static final ObjectMapper mapper = new ObjectMapper();
diff --git a/pom.xml b/pom.xml
index 89527a19d..848b5fd1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>software.aws.lambda</groupId>
+    <groupId>software.amazon.lambda</groupId>
     <artifactId>aws-lambda-powertools-java</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/src/main/java/software/aws/lambda/internal/LambdaHandlerProcessor.java b/src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java
similarity index 96%
rename from src/main/java/software/aws/lambda/internal/LambdaHandlerProcessor.java
rename to src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java
index 3e223fb21..cc3c12b89 100644
--- a/src/main/java/software/aws/lambda/internal/LambdaHandlerProcessor.java
+++ b/src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.internal;
+package software.amazon.lambda.internal;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/src/main/java/software/aws/lambda/logging/PowerLogger.java b/src/main/java/software/amazon/lambda/logging/PowerLogger.java
similarity index 82%
rename from src/main/java/software/aws/lambda/logging/PowerLogger.java
rename to src/main/java/software/amazon/lambda/logging/PowerLogger.java
index 21e69c851..5bb7365b2 100644
--- a/src/main/java/software/aws/lambda/logging/PowerLogger.java
+++ b/src/main/java/software/amazon/lambda/logging/PowerLogger.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.logging;
+package software.amazon.lambda.logging;
 
 import org.apache.logging.log4j.ThreadContext;
 
diff --git a/src/main/java/software/aws/lambda/logging/PowerToolsLogging.java b/src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java
similarity index 88%
rename from src/main/java/software/aws/lambda/logging/PowerToolsLogging.java
rename to src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java
index 4256efc55..98ade6924 100644
--- a/src/main/java/software/aws/lambda/logging/PowerToolsLogging.java
+++ b/src/main/java/software/amazon/lambda/logging/PowerToolsLogging.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.logging;
+package software.amazon.lambda.logging;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/software/aws/lambda/logging/internal/DefaultLambdaFields.java b/src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java
similarity index 94%
rename from src/main/java/software/aws/lambda/logging/internal/DefaultLambdaFields.java
rename to src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java
index ee2a504d7..9e2b04574 100644
--- a/src/main/java/software/aws/lambda/logging/internal/DefaultLambdaFields.java
+++ b/src/main/java/software/amazon/lambda/logging/internal/DefaultLambdaFields.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.amazon.lambda.logging.internal;
 
 import com.amazonaws.services.lambda.runtime.Context;
 
diff --git a/src/main/java/software/aws/lambda/logging/internal/LambdaLoggingAspect.java b/src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java
similarity index 88%
rename from src/main/java/software/aws/lambda/logging/internal/LambdaLoggingAspect.java
rename to src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java
index f065ca4fd..5e7b74fdf 100644
--- a/src/main/java/software/aws/lambda/logging/internal/LambdaLoggingAspect.java
+++ b/src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.amazon.lambda.logging.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -19,14 +19,14 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import software.aws.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.logging.PowerToolsLogging;
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
-import static software.aws.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
-import static software.aws.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
-import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
-import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
 
 @Aspect
 public final class LambdaLoggingAspect {
diff --git a/src/main/java/software/aws/lambda/tracing/PowerToolTracing.java b/src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java
similarity index 90%
rename from src/main/java/software/aws/lambda/tracing/PowerToolTracing.java
rename to src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java
index 48a2d4439..93f66fc63 100644
--- a/src/main/java/software/aws/lambda/tracing/PowerToolTracing.java
+++ b/src/main/java/software/amazon/lambda/tracing/PowerToolTracing.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.tracing;
+package software.amazon.lambda.tracing;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/software/aws/lambda/tracing/PowerTracer.java b/src/main/java/software/amazon/lambda/tracing/PowerTracer.java
similarity index 98%
rename from src/main/java/software/aws/lambda/tracing/PowerTracer.java
rename to src/main/java/software/amazon/lambda/tracing/PowerTracer.java
index 969e7c544..ba5ace41a 100644
--- a/src/main/java/software/aws/lambda/tracing/PowerTracer.java
+++ b/src/main/java/software/amazon/lambda/tracing/PowerTracer.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.tracing;
+package software.amazon.lambda.tracing;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java b/src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java
similarity index 77%
rename from src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java
rename to src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java
index eb598fcf6..ba7348f13 100644
--- a/src/main/java/software/aws/lambda/tracing/internal/LambdaTracingAspect.java
+++ b/src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.tracing.internal;
+package software.amazon.lambda.tracing.internal;
 
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Subsegment;
@@ -7,13 +7,13 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import software.aws.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerTracer;
 
-import static software.aws.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
-import static software.aws.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
-import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
-import static software.aws.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
-import static software.aws.lambda.tracing.PowerTracer.SERVICE_NAME;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
 
 @Aspect
 public final class LambdaTracingAspect {
@@ -59,7 +59,7 @@ public Object around(ProceedingJoinPoint pjp,
     }
 
     private String namespace(PowerToolTracing powerToolsTracing) {
-        return powerToolsTracing.namespace().isEmpty() ? SERVICE_NAME : powerToolsTracing.namespace();
+        return powerToolsTracing.namespace().isEmpty() ? PowerTracer.SERVICE_NAME : powerToolsTracing.namespace();
     }
 
     private boolean placedOnHandlerMethod(ProceedingJoinPoint pjp) {
diff --git a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java
similarity index 79%
rename from src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java
rename to src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java
index 23d0dbe9b..3c21ae3fd 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabled.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabled.java
@@ -1,8 +1,8 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.aws.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.logging.PowerToolsLogging;
 
 public class PowerLogToolEnabled implements RequestHandler<Object, Object> {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java
similarity index 80%
rename from src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java
rename to src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java
index 1163617ba..d2a1b90e7 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerLogToolEnabledForStream.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerLogToolEnabledForStream.java
@@ -1,11 +1,11 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-import software.aws.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.logging.PowerToolsLogging;
 
 public class PowerLogToolEnabledForStream implements RequestStreamHandler {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java
similarity index 88%
rename from src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java
rename to src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java
index 9d6c35510..43bc31cf2 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerToolDisabled.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabled.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java
similarity index 89%
rename from src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java
rename to src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java
index 49836c91b..63ea3ddf4 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerToolDisabledForStream.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerToolDisabledForStream.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java
similarity index 78%
rename from src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java
rename to src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java
index 8bc7ee084..66d84bedc 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabled.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabled.java
@@ -1,8 +1,8 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.aws.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.logging.PowerToolsLogging;
 
 public class PowerToolLogEventEnabled implements RequestHandler<Object, Object> {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java
similarity index 87%
rename from src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java
rename to src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java
index 28bfc542e..352f3e7b5 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerToolLogEventEnabledForStream.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerToolLogEventEnabledForStream.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -8,7 +8,7 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import software.aws.lambda.logging.PowerToolsLogging;
+import software.amazon.lambda.logging.PowerToolsLogging;
 
 public class PowerToolLogEventEnabledForStream implements RequestStreamHandler {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java
similarity index 78%
rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java
rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java
index 6df2ee6b9..f2fc0a0b3 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabled.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabled.java
@@ -1,8 +1,8 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.aws.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolTracing;
 
 public class PowerTracerToolEnabled implements RequestHandler<Object, Object> {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java
similarity index 81%
rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java
rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java
index ee13f9946..8c446b30e 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStream.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStream.java
@@ -1,11 +1,11 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-import software.aws.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolTracing;
 
 public class PowerTracerToolEnabledForStream implements RequestStreamHandler {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java
similarity index 82%
rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java
rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java
index 8788121bb..f04cdfdf5 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledForStreamWithNoMetaData.java
@@ -1,11 +1,11 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-import software.aws.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolTracing;
 
 public class PowerTracerToolEnabledForStreamWithNoMetaData implements RequestStreamHandler {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java
similarity index 80%
rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java
rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java
index 542a5069c..24940a031 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithException.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithException.java
@@ -1,8 +1,8 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.aws.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolTracing;
 
 public class PowerTracerToolEnabledWithException implements RequestHandler<Object, Object> {
 
diff --git a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java
similarity index 80%
rename from src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java
rename to src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java
index 1c3584922..2c41073f4 100644
--- a/src/test/java/software/aws/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java
+++ b/src/test/java/software/amazon/lambda/handlers/PowerTracerToolEnabledWithNoMetaData.java
@@ -1,8 +1,8 @@
-package software.aws.lambda.handlers;
+package software.amazon.lambda.handlers;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
-import software.aws.lambda.tracing.PowerToolTracing;
+import software.amazon.lambda.tracing.PowerToolTracing;
 
 public class PowerTracerToolEnabledWithNoMetaData implements RequestHandler<Object, Object> {
 
diff --git a/src/test/java/software/aws/lambda/logging/PowerLoggerTest.java b/src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java
similarity index 86%
rename from src/test/java/software/aws/lambda/logging/PowerLoggerTest.java
rename to src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java
index 0e56c8255..fcec6f6ac 100644
--- a/src/test/java/software/aws/lambda/logging/PowerLoggerTest.java
+++ b/src/test/java/software/amazon/lambda/logging/PowerLoggerTest.java
@@ -1,9 +1,8 @@
-package software.aws.lambda.logging;
+package software.amazon.lambda.logging;
 
 import org.apache.logging.log4j.ThreadContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import software.aws.lambda.logging.PowerLogger;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java b/src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java
similarity index 91%
rename from src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java
rename to src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java
index 7dc7eba66..a1451ad6e 100644
--- a/src/test/java/software/aws/lambda/logging/internal/LambdaLoggingAspectTest.java
+++ b/src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.logging.internal;
+package software.amazon.lambda.logging.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -15,13 +15,13 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import software.aws.lambda.handlers.PowerToolDisabled;
-import software.aws.lambda.handlers.PowerToolDisabledForStream;
-import software.aws.lambda.handlers.PowerLogToolEnabled;
-import software.aws.lambda.handlers.PowerLogToolEnabledForStream;
-import software.aws.lambda.handlers.PowerToolLogEventEnabled;
-import software.aws.lambda.handlers.PowerToolLogEventEnabledForStream;
-import software.aws.lambda.internal.LambdaHandlerProcessor;
+import software.amazon.lambda.internal.LambdaHandlerProcessor;
+import software.amazon.lambda.handlers.PowerToolDisabled;
+import software.amazon.lambda.handlers.PowerToolDisabledForStream;
+import software.amazon.lambda.handlers.PowerLogToolEnabled;
+import software.amazon.lambda.handlers.PowerLogToolEnabledForStream;
+import software.amazon.lambda.handlers.PowerToolLogEventEnabled;
+import software.amazon.lambda.handlers.PowerToolLogEventEnabledForStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
diff --git a/src/test/java/software/aws/lambda/tracing/PowerTracerTest.java b/src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java
similarity index 98%
rename from src/test/java/software/aws/lambda/tracing/PowerTracerTest.java
rename to src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java
index bce270e64..deada5db2 100644
--- a/src/test/java/software/aws/lambda/tracing/PowerTracerTest.java
+++ b/src/test/java/software/amazon/lambda/tracing/PowerTracerTest.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.tracing;
+package software.amazon.lambda.tracing;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.xray.AWSXRay;
@@ -10,7 +10,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static software.aws.lambda.tracing.PowerTracer.withEntitySubsegment;
+import static software.amazon.lambda.tracing.PowerTracer.withEntitySubsegment;
 
 class PowerTracerTest {
 
diff --git a/src/test/java/software/aws/lambda/tracing/internal/LambdaTracingAspectTest.java b/src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java
similarity index 90%
rename from src/test/java/software/aws/lambda/tracing/internal/LambdaTracingAspectTest.java
rename to src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java
index 44a3623e3..ecf5c592d 100644
--- a/src/test/java/software/aws/lambda/tracing/internal/LambdaTracingAspectTest.java
+++ b/src/test/java/software/amazon/lambda/tracing/internal/LambdaTracingAspectTest.java
@@ -1,4 +1,4 @@
-package software.aws.lambda.tracing.internal;
+package software.amazon.lambda.tracing.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -12,14 +12,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
-import software.aws.lambda.handlers.PowerToolDisabled;
-import software.aws.lambda.handlers.PowerToolDisabledForStream;
-import software.aws.lambda.handlers.PowerTracerToolEnabled;
-import software.aws.lambda.handlers.PowerTracerToolEnabledForStream;
-import software.aws.lambda.handlers.PowerTracerToolEnabledForStreamWithNoMetaData;
-import software.aws.lambda.handlers.PowerTracerToolEnabledWithException;
-import software.aws.lambda.handlers.PowerTracerToolEnabledWithNoMetaData;
-import software.aws.lambda.internal.LambdaHandlerProcessor;
+import software.amazon.lambda.handlers.PowerToolDisabled;
+import software.amazon.lambda.handlers.PowerToolDisabledForStream;
+import software.amazon.lambda.handlers.PowerTracerToolEnabledForStreamWithNoMetaData;
+import software.amazon.lambda.handlers.PowerTracerToolEnabledWithException;
+import software.amazon.lambda.handlers.PowerTracerToolEnabled;
+import software.amazon.lambda.handlers.PowerTracerToolEnabledForStream;
+import software.amazon.lambda.handlers.PowerTracerToolEnabledWithNoMetaData;
+import software.amazon.lambda.internal.LambdaHandlerProcessor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;