diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json
index 89529a651aafb..ae26dbae49ba7 100644
--- a/packages/@aws-cdk/assets/package.json
+++ b/packages/@aws-cdk/assets/package.json
@@ -11,7 +11,7 @@
         "package": "software.amazon.awscdk.assets",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "assets"
+          "artifactId": "cdk-assets"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-apigateway/package.json b/packages/@aws-cdk/aws-apigateway/package.json
index 794d982446d06..db98afb44b4f7 100644
--- a/packages/@aws-cdk/aws-apigateway/package.json
+++ b/packages/@aws-cdk/aws-apigateway/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.apigateway",
+        "package": "software.amazon.awscdk.services.apigateway",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-apigateway"
+          "artifactId": "apigateway"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-applicationautoscaling/package.json b/packages/@aws-cdk/aws-applicationautoscaling/package.json
index ce2052a6447ce..b6fc58a475de9 100644
--- a/packages/@aws-cdk/aws-applicationautoscaling/package.json
+++ b/packages/@aws-cdk/aws-applicationautoscaling/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.applicationautoscaling",
+        "package": "software.amazon.awscdk.services.applicationautoscaling",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-applicationautoscaling"
+          "artifactId": "applicationautoscaling"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-appsync/package.json b/packages/@aws-cdk/aws-appsync/package.json
index 90d37ee2bd5fe..4370597999648 100644
--- a/packages/@aws-cdk/aws-appsync/package.json
+++ b/packages/@aws-cdk/aws-appsync/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.appsync",
+        "package": "software.amazon.awscdk.services.appsync",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-appsync"
+          "artifactId": "appsync"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-athena/package.json b/packages/@aws-cdk/aws-athena/package.json
index 6beaea2cf4691..64fc86dcc6ce3 100644
--- a/packages/@aws-cdk/aws-athena/package.json
+++ b/packages/@aws-cdk/aws-athena/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.athena",
+        "package": "software.amazon.awscdk.services.athena",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-athena"
+          "artifactId": "athena"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-autoscaling/package.json b/packages/@aws-cdk/aws-autoscaling/package.json
index fbf02d73c2cfc..00004e3905dd2 100644
--- a/packages/@aws-cdk/aws-autoscaling/package.json
+++ b/packages/@aws-cdk/aws-autoscaling/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.autoscaling",
+        "package": "software.amazon.awscdk.services.autoscaling",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-autoscaling"
+          "artifactId": "autoscaling"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-autoscalingplans/package.json b/packages/@aws-cdk/aws-autoscalingplans/package.json
index e5dd233041ddd..04fafb2d839a7 100644
--- a/packages/@aws-cdk/aws-autoscalingplans/package.json
+++ b/packages/@aws-cdk/aws-autoscalingplans/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.autoscalingplans",
+        "package": "software.amazon.awscdk.services.autoscalingplans",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-autoscalingplans"
+          "artifactId": "autoscalingplans"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-batch/package.json b/packages/@aws-cdk/aws-batch/package.json
index 2ef8cf5124f50..b70522dd04aa8 100644
--- a/packages/@aws-cdk/aws-batch/package.json
+++ b/packages/@aws-cdk/aws-batch/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.batch",
+        "package": "software.amazon.awscdk.services.batch",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-batch"
+          "artifactId": "batch"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-budgets/package.json b/packages/@aws-cdk/aws-budgets/package.json
index ea06e22969a82..c914908fcaeb5 100644
--- a/packages/@aws-cdk/aws-budgets/package.json
+++ b/packages/@aws-cdk/aws-budgets/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.budgets",
+        "package": "software.amazon.awscdk.services.budgets",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-budgets"
+          "artifactId": "budgets"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-certificatemanager/package.json b/packages/@aws-cdk/aws-certificatemanager/package.json
index e1b8315b2087d..33097a8e758ff 100644
--- a/packages/@aws-cdk/aws-certificatemanager/package.json
+++ b/packages/@aws-cdk/aws-certificatemanager/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.certificatemanager",
+        "package": "software.amazon.awscdk.services.certificatemanager",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-certificatemanager"
+          "artifactId": "certificatemanager"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-cloud9/package.json b/packages/@aws-cdk/aws-cloud9/package.json
index 428f346a2cbc4..c35e9515dca88 100644
--- a/packages/@aws-cdk/aws-cloud9/package.json
+++ b/packages/@aws-cdk/aws-cloud9/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.cloud9",
+        "package": "software.amazon.awscdk.services.cloud9",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-cloud9"
+          "artifactId": "cloud9"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-cloudformation/package.json b/packages/@aws-cdk/aws-cloudformation/package.json
index 2356b8fce7665..4f7c4685d6079 100644
--- a/packages/@aws-cdk/aws-cloudformation/package.json
+++ b/packages/@aws-cdk/aws-cloudformation/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.cloudformation",
+        "package": "software.amazon.awscdk.services.cloudformation",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-cloudformation"
+          "artifactId": "cloudformation"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json
index 997ffcf4a3b9a..a1ecb44aac78f 100644
--- a/packages/@aws-cdk/aws-cloudfront/package.json
+++ b/packages/@aws-cdk/aws-cloudfront/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.cloudfront",
+        "package": "software.amazon.awscdk.services.cloudfront",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-cloudfront"
+          "artifactId": "cloudfront"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-cloudtrail/package.json b/packages/@aws-cdk/aws-cloudtrail/package.json
index 09c150e608c55..0ddc7818a8f6e 100644
--- a/packages/@aws-cdk/aws-cloudtrail/package.json
+++ b/packages/@aws-cdk/aws-cloudtrail/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.cloudtrail",
+        "package": "software.amazon.awscdk.services.cloudtrail",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-cloudtrail"
+          "artifactId": "cloudtrail"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-cloudwatch/package.json b/packages/@aws-cdk/aws-cloudwatch/package.json
index 798acf76f7bfd..ad57d647b50a0 100644
--- a/packages/@aws-cdk/aws-cloudwatch/package.json
+++ b/packages/@aws-cdk/aws-cloudwatch/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.cloudwatch",
+        "package": "software.amazon.awscdk.services.cloudwatch",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-cloudwatch"
+          "artifactId": "cloudwatch"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-codebuild-codepipeline/package.json b/packages/@aws-cdk/aws-codebuild-codepipeline/package.json
index 93cda1d889c5a..f62f9fa83e457 100644
--- a/packages/@aws-cdk/aws-codebuild-codepipeline/package.json
+++ b/packages/@aws-cdk/aws-codebuild-codepipeline/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.codebuild.codepipeline",
+        "package": "software.amazon.awscdk.services.codebuild.codepipeline",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-codebuild-codepipeline"
+          "artifactId": "codebuild-codepipeline"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-codebuild/package.json b/packages/@aws-cdk/aws-codebuild/package.json
index 49ca8a80503ef..eff49f44d27f9 100644
--- a/packages/@aws-cdk/aws-codebuild/package.json
+++ b/packages/@aws-cdk/aws-codebuild/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.codebuild",
+        "package": "software.amazon.awscdk.services.codebuild",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-codebuild"
+          "artifactId": "codebuild"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-codecommit-codepipeline/package.json b/packages/@aws-cdk/aws-codecommit-codepipeline/package.json
index 22cdaf4db9619..f2cee5ed18b0e 100644
--- a/packages/@aws-cdk/aws-codecommit-codepipeline/package.json
+++ b/packages/@aws-cdk/aws-codecommit-codepipeline/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.codecommit.codepipeline",
+        "package": "software.amazon.awscdk.services.codecommit.codepipeline",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-codecommit-codepipeline"
+          "artifactId": "codecommit-codepipeline"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-codecommit/package.json b/packages/@aws-cdk/aws-codecommit/package.json
index a079492e08c91..b68e1d07c8748 100644
--- a/packages/@aws-cdk/aws-codecommit/package.json
+++ b/packages/@aws-cdk/aws-codecommit/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.codecommit",
+        "package": "software.amazon.awscdk.services.codecommit",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-codecommit"
+          "artifactId": "codecommit"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-codedeploy/package.json b/packages/@aws-cdk/aws-codedeploy/package.json
index 16027445924c7..c5024bad2442b 100644
--- a/packages/@aws-cdk/aws-codedeploy/package.json
+++ b/packages/@aws-cdk/aws-codedeploy/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.codedeploy",
+        "package": "software.amazon.awscdk.services.codedeploy",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-codedeploy"
+          "artifactId": "codedeploy"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-codepipeline/package.json b/packages/@aws-cdk/aws-codepipeline/package.json
index 14be504f7b922..c9bb8f453561c 100644
--- a/packages/@aws-cdk/aws-codepipeline/package.json
+++ b/packages/@aws-cdk/aws-codepipeline/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.codepipeline",
+        "package": "software.amazon.awscdk.services.codepipeline",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-codepipeline"
+          "artifactId": "codepipeline"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-cognito/package.json b/packages/@aws-cdk/aws-cognito/package.json
index 69e2afdca0eb3..877753f50ed3b 100644
--- a/packages/@aws-cdk/aws-cognito/package.json
+++ b/packages/@aws-cdk/aws-cognito/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.cognito",
+        "package": "software.amazon.awscdk.services.cognito",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-cognito"
+          "artifactId": "cognito"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-config/package.json b/packages/@aws-cdk/aws-config/package.json
index 876a4c178eb0c..d633b1e0ffc11 100644
--- a/packages/@aws-cdk/aws-config/package.json
+++ b/packages/@aws-cdk/aws-config/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.config",
+        "package": "software.amazon.awscdk.services.config",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-config"
+          "artifactId": "config"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-custom-resources/package.json b/packages/@aws-cdk/aws-custom-resources/package.json
index 4d61fc8f72eff..1ff6a2593c7a4 100644
--- a/packages/@aws-cdk/aws-custom-resources/package.json
+++ b/packages/@aws-cdk/aws-custom-resources/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.customresources",
+        "package": "software.amazon.awscdk.services.customresources",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-customresources"
+          "artifactId": "custom-resources"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-datapipeline/package.json b/packages/@aws-cdk/aws-datapipeline/package.json
index 18f401bb08c47..009ad9e2e9937 100644
--- a/packages/@aws-cdk/aws-datapipeline/package.json
+++ b/packages/@aws-cdk/aws-datapipeline/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.datapipeline",
+        "package": "software.amazon.awscdk.services.datapipeline",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-datapipeline"
+          "artifactId": "datapipeline"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-dax/package.json b/packages/@aws-cdk/aws-dax/package.json
index 4a23802525a96..25279b0e8e9cb 100644
--- a/packages/@aws-cdk/aws-dax/package.json
+++ b/packages/@aws-cdk/aws-dax/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.dax",
+        "package": "software.amazon.awscdk.services.dax",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-dax"
+          "artifactId": "dax"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-directoryservice/package.json b/packages/@aws-cdk/aws-directoryservice/package.json
index 5f06e1fa5a856..821cd7025cd3e 100644
--- a/packages/@aws-cdk/aws-directoryservice/package.json
+++ b/packages/@aws-cdk/aws-directoryservice/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.directoryservice",
+        "package": "software.amazon.awscdk.services.directoryservice",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-directoryservice"
+          "artifactId": "directoryservice"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-dms/package.json b/packages/@aws-cdk/aws-dms/package.json
index c6c7f1cac9b1f..1812fed3f4901 100644
--- a/packages/@aws-cdk/aws-dms/package.json
+++ b/packages/@aws-cdk/aws-dms/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.dms",
+        "package": "software.amazon.awscdk.services.dms",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-dms"
+          "artifactId": "dms"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-dynamodb/package.json b/packages/@aws-cdk/aws-dynamodb/package.json
index b9ab68502b9dc..cdc1708cbb4c2 100644
--- a/packages/@aws-cdk/aws-dynamodb/package.json
+++ b/packages/@aws-cdk/aws-dynamodb/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.dynamodb",
+        "package": "software.amazon.awscdk.services.dynamodb",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-dynamodb"
+          "artifactId": "dynamodb"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-ec2/package.json b/packages/@aws-cdk/aws-ec2/package.json
index 38e4cf78a1342..869cd58d65b73 100644
--- a/packages/@aws-cdk/aws-ec2/package.json
+++ b/packages/@aws-cdk/aws-ec2/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.ec2",
+        "package": "software.amazon.awscdk.services.ec2",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-ec2"
+          "artifactId": "ec2"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-ecr/package.json b/packages/@aws-cdk/aws-ecr/package.json
index 8224cb0368791..7ad0d494381d9 100644
--- a/packages/@aws-cdk/aws-ecr/package.json
+++ b/packages/@aws-cdk/aws-ecr/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.ecr",
+        "package": "software.amazon.awscdk.services.ecr",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-ecr"
+          "artifactId": "ecr"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-ecs/package.json b/packages/@aws-cdk/aws-ecs/package.json
index e13f7a6e4f022..f2b2727869cfb 100644
--- a/packages/@aws-cdk/aws-ecs/package.json
+++ b/packages/@aws-cdk/aws-ecs/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.ecs",
+        "package": "software.amazon.awscdk.services.ecs",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-ecs"
+          "artifactId": "ecs"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-efs/package.json b/packages/@aws-cdk/aws-efs/package.json
index ef110d587d383..043f6b1a827cf 100644
--- a/packages/@aws-cdk/aws-efs/package.json
+++ b/packages/@aws-cdk/aws-efs/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.efs",
+        "package": "software.amazon.awscdk.services.efs",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-efs"
+          "artifactId": "efs"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-eks/package.json b/packages/@aws-cdk/aws-eks/package.json
index 85a418a76d4c8..ffdfa9ec2fc5f 100644
--- a/packages/@aws-cdk/aws-eks/package.json
+++ b/packages/@aws-cdk/aws-eks/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.eks",
+        "package": "software.amazon.awscdk.services.eks",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-eks"
+          "artifactId": "eks"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-elasticache/package.json b/packages/@aws-cdk/aws-elasticache/package.json
index 3899638c54c6f..606a609ec30e2 100644
--- a/packages/@aws-cdk/aws-elasticache/package.json
+++ b/packages/@aws-cdk/aws-elasticache/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.elasticache",
+        "package": "software.amazon.awscdk.services.elasticache",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-elasticache"
+          "artifactId": "elasticache"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-elasticbeanstalk/package.json b/packages/@aws-cdk/aws-elasticbeanstalk/package.json
index 91fbe370cb5de..10b1b65d008e5 100644
--- a/packages/@aws-cdk/aws-elasticbeanstalk/package.json
+++ b/packages/@aws-cdk/aws-elasticbeanstalk/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.elasticbeanstalk",
+        "package": "software.amazon.awscdk.services.elasticbeanstalk",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-elasticbeanstalk"
+          "artifactId": "elasticbeanstalk"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/package.json b/packages/@aws-cdk/aws-elasticloadbalancing/package.json
index 85c8b2eaaffff..7fa69fd8c1592 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancing/package.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancing/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.elasticloadbalancing",
+        "package": "software.amazon.awscdk.services.elasticloadbalancing",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-elasticloadbalancing"
+          "artifactId": "elasticloadbalancing"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
index 5a9ca87ad1fc2..8d83510a40ed1 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.elasticloadbalancingv2",
+        "package": "software.amazon.awscdk.services.elasticloadbalancingv2",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-elasticloadbalancingv2"
+          "artifactId": "elasticloadbalancingv2"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-elasticsearch/package.json b/packages/@aws-cdk/aws-elasticsearch/package.json
index 245f069c9fa0c..0ab1c17c4a67d 100644
--- a/packages/@aws-cdk/aws-elasticsearch/package.json
+++ b/packages/@aws-cdk/aws-elasticsearch/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.elasticsearch",
+        "package": "software.amazon.awscdk.services.elasticsearch",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-elasticsearch"
+          "artifactId": "elasticsearch"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-emr/package.json b/packages/@aws-cdk/aws-emr/package.json
index 4bbc802713162..fa45e9d50e957 100644
--- a/packages/@aws-cdk/aws-emr/package.json
+++ b/packages/@aws-cdk/aws-emr/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.emr",
+        "package": "software.amazon.awscdk.services.emr",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-emr"
+          "artifactId": "emr"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json
index 94e4665396081..36d949617138a 100644
--- a/packages/@aws-cdk/aws-events/package.json
+++ b/packages/@aws-cdk/aws-events/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.events",
+        "package": "software.amazon.awscdk.services.events",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-events"
+          "artifactId": "events"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-gamelift/package.json b/packages/@aws-cdk/aws-gamelift/package.json
index 2eb89479f1488..91957eef654da 100644
--- a/packages/@aws-cdk/aws-gamelift/package.json
+++ b/packages/@aws-cdk/aws-gamelift/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.gamelift",
+        "package": "software.amazon.awscdk.services.gamelift",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-gamelift"
+          "artifactId": "gamelift"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-glue/package.json b/packages/@aws-cdk/aws-glue/package.json
index ea59d22380c32..6e96aa46e3b51 100644
--- a/packages/@aws-cdk/aws-glue/package.json
+++ b/packages/@aws-cdk/aws-glue/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.glue",
+        "package": "software.amazon.awscdk.services.glue",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-glue"
+          "artifactId": "glue"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-guardduty/package.json b/packages/@aws-cdk/aws-guardduty/package.json
index 51f7e626ec8b9..7f44f27d81723 100644
--- a/packages/@aws-cdk/aws-guardduty/package.json
+++ b/packages/@aws-cdk/aws-guardduty/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.guardduty",
+        "package": "software.amazon.awscdk.services.guardduty",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-guardduty"
+          "artifactId": "guardduty"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-iam/package.json b/packages/@aws-cdk/aws-iam/package.json
index 3b0e00529273b..4484af3304a3d 100644
--- a/packages/@aws-cdk/aws-iam/package.json
+++ b/packages/@aws-cdk/aws-iam/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.iam",
+        "package": "software.amazon.awscdk.services.iam",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-iam"
+          "artifactId": "iam"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-inspector/package.json b/packages/@aws-cdk/aws-inspector/package.json
index f13952606f040..8a0ffb6174630 100644
--- a/packages/@aws-cdk/aws-inspector/package.json
+++ b/packages/@aws-cdk/aws-inspector/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.inspector",
+        "package": "software.amazon.awscdk.services.inspector",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-inspector"
+          "artifactId": "inspector"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-iot/package.json b/packages/@aws-cdk/aws-iot/package.json
index ac7bef337936a..484afa326d4b6 100644
--- a/packages/@aws-cdk/aws-iot/package.json
+++ b/packages/@aws-cdk/aws-iot/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.iot",
+        "package": "software.amazon.awscdk.services.iot",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-iot"
+          "artifactId": "iot"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-kinesis/package.json b/packages/@aws-cdk/aws-kinesis/package.json
index 412e3250bae5a..2f185ba554660 100644
--- a/packages/@aws-cdk/aws-kinesis/package.json
+++ b/packages/@aws-cdk/aws-kinesis/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.kinesis",
+        "package": "software.amazon.awscdk.services.kinesis",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-kinesis"
+          "artifactId": "kinesis"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-kinesisanalytics/package.json b/packages/@aws-cdk/aws-kinesisanalytics/package.json
index afdf537bdc32a..1c1b3cb137e27 100644
--- a/packages/@aws-cdk/aws-kinesisanalytics/package.json
+++ b/packages/@aws-cdk/aws-kinesisanalytics/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.kinesisanalytics",
+        "package": "software.amazon.awscdk.services.kinesisanalytics",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-kinesisanalytics"
+          "artifactId": "kinesisanalytics"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-kinesisfirehose/package.json b/packages/@aws-cdk/aws-kinesisfirehose/package.json
index 1aa7273454508..6f4db4bb350fe 100644
--- a/packages/@aws-cdk/aws-kinesisfirehose/package.json
+++ b/packages/@aws-cdk/aws-kinesisfirehose/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.kinesisfirehose",
+        "package": "software.amazon.awscdk.services.kinesisfirehose",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-kinesisfirehose"
+          "artifactId": "kinesisfirehose"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-kms/package.json b/packages/@aws-cdk/aws-kms/package.json
index 7c2687bd78a33..b9896ad7006b9 100644
--- a/packages/@aws-cdk/aws-kms/package.json
+++ b/packages/@aws-cdk/aws-kms/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.kms",
+        "package": "software.amazon.awscdk.services.kms",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-kms"
+          "artifactId": "kms"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-lambda-codepipeline/package.json b/packages/@aws-cdk/aws-lambda-codepipeline/package.json
index e80ef7f111231..5d7f9cf488366 100644
--- a/packages/@aws-cdk/aws-lambda-codepipeline/package.json
+++ b/packages/@aws-cdk/aws-lambda-codepipeline/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.lambda.codepipeline",
+        "package": "software.amazon.awscdk.services.lambda.codepipeline",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-lambda-codepipeline"
+          "artifactId": "lambda-codepipeline"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-lambda/package.json b/packages/@aws-cdk/aws-lambda/package.json
index 657f35e1955d9..1e54635650574 100644
--- a/packages/@aws-cdk/aws-lambda/package.json
+++ b/packages/@aws-cdk/aws-lambda/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.lambda",
+        "package": "software.amazon.awscdk.services.lambda",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-lambda"
+          "artifactId": "lambda"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-logs/package.json b/packages/@aws-cdk/aws-logs/package.json
index caa5fc6c037d0..0885ca160b944 100644
--- a/packages/@aws-cdk/aws-logs/package.json
+++ b/packages/@aws-cdk/aws-logs/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.logs",
+        "package": "software.amazon.awscdk.services.logs",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-logs"
+          "artifactId": "logs"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-neptune/package.json b/packages/@aws-cdk/aws-neptune/package.json
index e60bb94bc3a3d..20815910f019a 100644
--- a/packages/@aws-cdk/aws-neptune/package.json
+++ b/packages/@aws-cdk/aws-neptune/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.neptune",
+        "package": "software.amazon.awscdk.services.neptune",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-neptune"
+          "artifactId": "neptune"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-opsworks/package.json b/packages/@aws-cdk/aws-opsworks/package.json
index bbf1af0897edc..d8cf8df71ad67 100644
--- a/packages/@aws-cdk/aws-opsworks/package.json
+++ b/packages/@aws-cdk/aws-opsworks/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.opsworks",
+        "package": "software.amazon.awscdk.services.opsworks",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-opsworks"
+          "artifactId": "opsworks"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-quickstarts/package.json b/packages/@aws-cdk/aws-quickstarts/package.json
index 76f80c2dc355b..6facd5cfc7dd2 100644
--- a/packages/@aws-cdk/aws-quickstarts/package.json
+++ b/packages/@aws-cdk/aws-quickstarts/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.quickstarts",
+        "package": "software.amazon.awscdk.services.quickstarts",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-quickstarts"
+          "artifactId": "quickstarts"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-rds/package.json b/packages/@aws-cdk/aws-rds/package.json
index 2cac2fcaba43c..92e089aae6945 100644
--- a/packages/@aws-cdk/aws-rds/package.json
+++ b/packages/@aws-cdk/aws-rds/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.rds",
+        "package": "software.amazon.awscdk.services.rds",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-rds"
+          "artifactId": "rds"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-redshift/package.json b/packages/@aws-cdk/aws-redshift/package.json
index def92fdb93b78..fa3411b8d9e8d 100644
--- a/packages/@aws-cdk/aws-redshift/package.json
+++ b/packages/@aws-cdk/aws-redshift/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.redshift",
+        "package": "software.amazon.awscdk.services.redshift",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-redshift"
+          "artifactId": "redshift"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-route53/package.json b/packages/@aws-cdk/aws-route53/package.json
index 14a7f817f6a74..b69176335d829 100644
--- a/packages/@aws-cdk/aws-route53/package.json
+++ b/packages/@aws-cdk/aws-route53/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.route53",
+        "package": "software.amazon.awscdk.services.route53",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-route53"
+          "artifactId": "route53"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-s3/package.json b/packages/@aws-cdk/aws-s3/package.json
index 6e6dc3d3f58c0..28387302b77a0 100644
--- a/packages/@aws-cdk/aws-s3/package.json
+++ b/packages/@aws-cdk/aws-s3/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.s3",
+        "package": "software.amazon.awscdk.services.s3",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-s3"
+          "artifactId": "s3"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-sdb/package.json b/packages/@aws-cdk/aws-sdb/package.json
index f2fb44d34514d..2e5af0851b73c 100644
--- a/packages/@aws-cdk/aws-sdb/package.json
+++ b/packages/@aws-cdk/aws-sdb/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.sdb",
+        "package": "software.amazon.awscdk.services.sdb",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-sdb"
+          "artifactId": "sdb"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-serverless/package.json b/packages/@aws-cdk/aws-serverless/package.json
index 3339913dbd86e..fb888a2a1c7f2 100644
--- a/packages/@aws-cdk/aws-serverless/package.json
+++ b/packages/@aws-cdk/aws-serverless/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.serverless",
+        "package": "software.amazon.awscdk.services.serverless",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-serverless"
+          "artifactId": "serverless"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-servicecatalog/package.json b/packages/@aws-cdk/aws-servicecatalog/package.json
index 3f60f568770b4..31dd9fb607d99 100644
--- a/packages/@aws-cdk/aws-servicecatalog/package.json
+++ b/packages/@aws-cdk/aws-servicecatalog/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.servicecatalog",
+        "package": "software.amazon.awscdk.services.servicecatalog",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-servicecatalog"
+          "artifactId": "servicecatalog"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-servicediscovery/package.json b/packages/@aws-cdk/aws-servicediscovery/package.json
index 93656b24a4cee..6ce5b7added1c 100644
--- a/packages/@aws-cdk/aws-servicediscovery/package.json
+++ b/packages/@aws-cdk/aws-servicediscovery/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.servicediscovery",
+        "package": "software.amazon.awscdk.services.servicediscovery",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-servicediscovery"
+          "artifactId": "servicediscovery"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-ses/package.json b/packages/@aws-cdk/aws-ses/package.json
index 3f7e42b4d1b06..8ca80ab3a35eb 100644
--- a/packages/@aws-cdk/aws-ses/package.json
+++ b/packages/@aws-cdk/aws-ses/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.ses",
+        "package": "software.amazon.awscdk.services.ses",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-ses"
+          "artifactId": "ses"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-sns/package.json b/packages/@aws-cdk/aws-sns/package.json
index 83ae20b08bc17..da7ae83497745 100644
--- a/packages/@aws-cdk/aws-sns/package.json
+++ b/packages/@aws-cdk/aws-sns/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.sns",
+        "package": "software.amazon.awscdk.services.sns",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-sns"
+          "artifactId": "sns"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-sqs/package.json b/packages/@aws-cdk/aws-sqs/package.json
index f32fa302af66f..1eca3a52323f4 100644
--- a/packages/@aws-cdk/aws-sqs/package.json
+++ b/packages/@aws-cdk/aws-sqs/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.sqs",
+        "package": "software.amazon.awscdk.services.sqs",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-sqs"
+          "artifactId": "sqs"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-ssm/package.json b/packages/@aws-cdk/aws-ssm/package.json
index adac87b17473a..18e64c5c708af 100644
--- a/packages/@aws-cdk/aws-ssm/package.json
+++ b/packages/@aws-cdk/aws-ssm/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.ssm",
+        "package": "software.amazon.awscdk.services.ssm",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-ssm"
+          "artifactId": "ssm"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-stepfunctions/package.json b/packages/@aws-cdk/aws-stepfunctions/package.json
index fc8490057b8be..d6ff4bf43be14 100644
--- a/packages/@aws-cdk/aws-stepfunctions/package.json
+++ b/packages/@aws-cdk/aws-stepfunctions/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.stepfunctions",
+        "package": "software.amazon.awscdk.services.stepfunctions",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-stepfunctions"
+          "artifactId": "stepfunctions"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-waf/package.json b/packages/@aws-cdk/aws-waf/package.json
index 140f14a2e480f..b20504812848b 100644
--- a/packages/@aws-cdk/aws-waf/package.json
+++ b/packages/@aws-cdk/aws-waf/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.waf",
+        "package": "software.amazon.awscdk.services.waf",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-waf"
+          "artifactId": "waf"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-wafregional/package.json b/packages/@aws-cdk/aws-wafregional/package.json
index 8675ea9174142..d0a2170084bec 100644
--- a/packages/@aws-cdk/aws-wafregional/package.json
+++ b/packages/@aws-cdk/aws-wafregional/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.wafregional",
+        "package": "software.amazon.awscdk.services.wafregional",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-wafregional"
+          "artifactId": "wafregional"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-workspaces/package.json b/packages/@aws-cdk/aws-workspaces/package.json
index f31f6a7018059..1bb6734bec5cf 100644
--- a/packages/@aws-cdk/aws-workspaces/package.json
+++ b/packages/@aws-cdk/aws-workspaces/package.json
@@ -8,10 +8,10 @@
     "outdir": "dist",
     "targets": {
       "java": {
-        "package": "software.amazon.awscdk.aws.workspaces",
+        "package": "software.amazon.awscdk.services.workspaces",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "aws-workspaces"
+          "artifactId": "workspaces"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json
index 8365ca3f9606f..4b96f34eebbf9 100644
--- a/packages/@aws-cdk/cx-api/package.json
+++ b/packages/@aws-cdk/cx-api/package.json
@@ -11,7 +11,7 @@
         "package": "software.amazon.awscdk.cxapi",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "cxapi"
+          "artifactId": "cdk-cx-api"
         }
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/rtv/package.json b/packages/@aws-cdk/rtv/package.json
index a454e01e866d5..35eb69afea434 100644
--- a/packages/@aws-cdk/rtv/package.json
+++ b/packages/@aws-cdk/rtv/package.json
@@ -11,7 +11,7 @@
         "package": "software.amazon.awscdk.rtv",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "rtv"
+          "artifactId": "cdk-rtv"
         }
       },
       "dotnet": {
diff --git a/tools/pkglint/lib/rules.ts b/tools/pkglint/lib/rules.ts
index 95cfa315e07b6..f68c0188644e7 100644
--- a/tools/pkglint/lib/rules.ts
+++ b/tools/pkglint/lib/rules.ts
@@ -148,7 +148,7 @@ export class JSIIJavaPackageIsRequired extends ValidationRule {
         expectJSON(pkg, 'jsii.targets.java.maven.artifactId', moduleName.mavenArtifactId, /-/g);
 
         const java = deepGet(pkg.json, ['jsii', 'targets', 'java', 'package']) as string | undefined;
-        expectJSON(pkg, 'jsii.targets.java.package', moduleName.javaPackage, /./g);
+        expectJSON(pkg, 'jsii.targets.java.package', moduleName.javaPackage, /\./g);
         if (java) {
             const expectedPrefix = moduleName.javaPackage.split('.').slice(0, 3).join('.');
             const actualPrefix = java.split('.').slice(0, 3).join('.');
@@ -214,8 +214,10 @@ function cdkModuleName(name: string) {
     const dotnetSuffix = name.split('-').map(s => s === 'aws' ? 'AWS' : caseUtils.pascal(s)).join('.');
 
     return {
-        javaPackage: `software.amazon.awscdk${isCdkPkg ? '' : `.${name.replace(/-/g, '.')}`}`,
-        mavenArtifactId: isCdkPkg ? 'cdk' : name,
+        javaPackage: `software.amazon.awscdk${isCdkPkg ? '' : `.${name.replace(/^aws-/, 'services-').replace(/-/g, '.')}`}`,
+        mavenArtifactId: isCdkPkg ? 'cdk'
+                                  : name.startsWith('aws-') ? name.replace(/^aws-/, '')
+                                                            : `cdk-${name}`,
         dotnetNamespace: `Amazon.CDK${isCdkPkg ? '' : `.${dotnetSuffix}`}`
     };
 }
@@ -229,7 +231,7 @@ export class JSIIDotNetNamespaceIsRequired extends ValidationRule {
 
         const dotnet = deepGet(pkg.json, ['jsii', 'targets', 'dotnet', 'namespace']) as string | undefined;
         const moduleName = cdkModuleName(pkg.json.name);
-        expectJSON(pkg, 'jsii.targets.dotnet.namespace', moduleName.dotnetNamespace, /./g);
+        expectJSON(pkg, 'jsii.targets.dotnet.namespace', moduleName.dotnetNamespace, /\./g, /*case insensitive*/ true);
 
         if (dotnet) {
             const actualPrefix = dotnet.split('.').slice(0, 2).join('.');
diff --git a/tools/pkglint/lib/util.ts b/tools/pkglint/lib/util.ts
index a4b045101ab86..955944607bec5 100644
--- a/tools/pkglint/lib/util.ts
+++ b/tools/pkglint/lib/util.ts
@@ -5,10 +5,10 @@ import { PackageJson } from "./packagejson";
 /**
  * Expect a particular JSON key to be a given value
  */
-export function expectJSON(pkg: PackageJson, jsonPath: string, expected: any, ignore?: RegExp) {
+export function expectJSON(pkg: PackageJson, jsonPath: string, expected: any, ignore?: RegExp, caseInsensitive: boolean = false) {
     const parts = jsonPath.split('.');
     const actual = deepGet(pkg.json, parts);
-    if (applyIgnore(actual) !== applyIgnore(expected)) {
+    if (applyCaseInsensitive(applyIgnore(actual)) !== applyCaseInsensitive(applyIgnore(expected))) {
         pkg.report({
             message: `${jsonPath} should be ${JSON.stringify(expected)}${ignore ? ` (ignoring ${ignore})` : ''}, is ${JSON.stringify(actual)}`,
             fix: () => { deepSet(pkg.json, parts, expected); }
@@ -20,6 +20,12 @@ export function expectJSON(pkg: PackageJson, jsonPath: string, expected: any, ig
         const str = JSON.stringify(val);
         return str.replace(ignore, '');
     }
+
+    function applyCaseInsensitive(val: any): any {
+        if (!caseInsensitive || val == null) { return val; }
+        const str = JSON.stringify(val);
+        return str.toLowerCase();
+    }
 }
 
 /**