diff --git a/.ebextensions/lambda-function.config b/.ebextensions/lambda-function.config
index 3b15669..664c12e 100644
--- a/.ebextensions/lambda-function.config
+++ b/.ebextensions/lambda-function.config
@@ -9,10 +9,11 @@ Resources:
         Variables:
           REGION_NAME: {"Ref" : "AWS::Region"}
           TOPIC_ARN: {"Ref" : "NotificationTopic"}
-      FunctionName: random-name
+      FunctionName: random-name-embedded
       Handler: index.handler
       Role: { "Fn::Join": [ "", [ "arn:aws:iam::",{"Ref" : "AWS::AccountId"},":role/service-role/scorekeep-lambda" ] ] }
       Runtime: nodejs4.3
+      Timeout: 7
 
 commands:
   install-npm:
@@ -51,4 +52,4 @@ files:
       cd _lambda/random-name
       /home/ec2-user/bin/npm install
       zip -r ../random-name.zip *
-      aws lambda update-function-code --function-name random-name --zip-file fileb://../random-name.zip --region $REGION
+      aws lambda update-function-code --function-name random-name-embedded --zip-file fileb://../random-name.zip --region $REGION
diff --git a/src/main/java/scorekeep/RandomNameService.java b/src/main/java/scorekeep/RandomNameService.java
index ca8466a..02f184f 100644
--- a/src/main/java/scorekeep/RandomNameService.java
+++ b/src/main/java/scorekeep/RandomNameService.java
@@ -2,6 +2,6 @@
 import com.amazonaws.services.lambda.invoke.LambdaFunction;
 
 public interface RandomNameService {
-  @LambdaFunction(functionName="random-name")
+  @LambdaFunction(functionName="random-name-embedded")
   RandomNameOutput randomName(RandomNameInput input);
 }
\ No newline at end of file