diff --git a/aws-serverless-java-container-spring/src/main/java/com/amazonaws/serverless/proxy/spring/SpringLambdacontainerHandler.java b/aws-serverless-java-container-spring/src/main/java/com/amazonaws/serverless/proxy/spring/SpringLambdacontainerHandler.java
index 2b6f2c9bf..44dbcd278 100644
--- a/aws-serverless-java-container-spring/src/main/java/com/amazonaws/serverless/proxy/spring/SpringLambdacontainerHandler.java
+++ b/aws-serverless-java-container-spring/src/main/java/com/amazonaws/serverless/proxy/spring/SpringLambdacontainerHandler.java
@@ -32,7 +32,7 @@
  * @param <RequestType> The incoming event type
  * @param <ResponseType> The expected return type
  */
-public class SpringLambdacontainerHandler<RequestType, ResponseType> extends LambdaContainerHandler<RequestType, ResponseType, AwsProxyHttpServletRequest, AwsHttpServletResponse> {
+public class SpringLambdaContainerHandler<RequestType, ResponseType> extends LambdaContainerHandler<RequestType, ResponseType, AwsProxyHttpServletRequest, AwsHttpServletResponse> {
     private LambdaSpringApplicationInitializer initializer;
 
     // State vars
@@ -44,10 +44,10 @@ public class SpringLambdacontainerHandler<RequestType, ResponseType> extends Lam
      * @return An initialized instance of the `SpringLambdaContainerHandler`
      * @throws ContainerInitializationException
      */
-    public static SpringLambdacontainerHandler<AwsProxyRequest, AwsProxyResponse> getAwsProxyHandler(Class... config)
+    public static SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> getAwsProxyHandler(Class... config)
             throws ContainerInitializationException {
-        SpringLambdacontainerHandler<AwsProxyRequest, AwsProxyResponse> handler =
-                new SpringLambdacontainerHandler<>(
+        SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler =
+                new SpringLambdaContainerHandler<>(
                         new AwsProxyHttpServletRequestReader(),
                         new AwsProxyHttpServletResponseWriter(),
                         new AwsProxySecurityContextWriter(),
@@ -68,7 +68,7 @@ public static SpringLambdacontainerHandler<AwsProxyRequest, AwsProxyResponse> ge
      * @param exceptionHandler An implementation of `ExceptionHandler`
      * @throws ContainerInitializationException
      */
-    public SpringLambdacontainerHandler(RequestReader<RequestType, AwsProxyHttpServletRequest> requestReader,
+    public SpringLambdaContainerHandler(RequestReader<RequestType, AwsProxyHttpServletRequest> requestReader,
                                        ResponseWriter<AwsHttpServletResponse, ResponseType> responseWriter,
                                        SecurityContextWriter<RequestType> securityContextWriter,
                                        ExceptionHandler<ResponseType> exceptionHandler)
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java
index 607d31521..aee11abf8 100644
--- a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java
+++ b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java
@@ -29,14 +29,14 @@ public class SpringAwsProxyTest {
 
 
     private static ObjectMapper objectMapper = new ObjectMapper();
-    private static SpringLambdacontainerHandler<AwsProxyRequest, AwsProxyResponse> handler = null;
+    private static SpringLambdaContainerHandler<AwsProxyRequest, AwsProxyResponse> handler = null;
 
     private static Context lambdaContext = new MockLambdaContext();
 
     @BeforeClass
     public static void init() {
         try {
-            handler = SpringLambdacontainerHandler.getAwsProxyHandler(EchoSpringAppConfig.class);
+            handler = SpringLambdaContainerHandler.getAwsProxyHandler(EchoSpringAppConfig.class);
         } catch (ContainerInitializationException e) {
             e.printStackTrace();
             fail();