diff --git a/lib/hipchat/capistrano/tasks/hipchat.rake b/lib/hipchat/capistrano/tasks/hipchat.rake
index 2bb91c4..6d883b6 100644
--- a/lib/hipchat/capistrano/tasks/hipchat.rake
+++ b/lib/hipchat/capistrano/tasks/hipchat.rake
@@ -65,18 +65,21 @@ namespace :hipchat do
 
   def deployment_name
     if fetch(:branch, nil)
-      application = fetch(:application)
       branch = fetch(:branch)
       real_revision = fetch(:real_revision)
 
-      name = "#{application}/#{branch}"
+      name = "#{application_name}/#{branch}"
       name += " (revision #{real_revision[0..7]})" if real_revision
       name
     else
-      application
+      application_name
     end
   end
 
+  def application_name
+    alt_application_name.nil? ? fetch(:application) : alt_application_name
+  end
+
   def message_color
     fetch(:hipchat_color, 'yellow')
   end
@@ -101,6 +104,10 @@ namespace :hipchat do
     fetch(:hipchat_deploy_user, 'Deploy')
   end
 
+  def alt_application_name
+    fetch(:hipchat_app_name, nil)
+  end
+
   def human
     user = ENV['HIPCHAT_USER'] || fetch(:hipchat_human)
     user = user || if (u = %x{git config user.name}.strip) != ''