diff --git a/cfndsl_ext/lambda_helper.rb b/cfndsl_ext/lambda_helper.rb
index e5c1a5f..c8f53c8 100644
--- a/cfndsl_ext/lambda_helper.rb
+++ b/cfndsl_ext/lambda_helper.rb
@@ -20,9 +20,16 @@ def render_lambda_functions(cfndsl, lambdas, lambda_metadata, distribution)
   end
 
   lambdas['functions'].each do |key, lambda_config|
-    name = key
+    if lambda_config['name_override'].nil?
+      name = key
+    else
+      name = lambda_config['name_override']
+    end
+    
     environment = lambda_config['environment'] || {}
 
+    
+
     # Create Lambda function
     function_name = name
     Lambda_Function(function_name) do
@@ -103,7 +110,11 @@ def render_lambda_functions(cfndsl, lambdas, lambda_metadata, distribution)
 
     if lambda_config.has_key?('log_retention')
       Logs_LogGroup("#{name}LogGroup") do
-        LogGroupName "/aws/lambda/#{name}"
+        if lambda_config['function_name'].nil?
+          LogGroupName "/aws/lambda/#{name}"
+        else
+          LogGroupName FnJoin('/',['/aws/lambda',lambda_config['function_name']])
+        end
         RetentionInDays lambda_config['log_retention'].to_i
       end
     end