diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index c99c73018ea..fb9626ac6e2 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -78,9 +78,11 @@ ABBREVIATIONS = {
     'away_mode_cmd_t': 'away_mode_command_topic',
     'away_mode_stat_tpl': 'away_mode_state_template',
     'away_mode_stat_t': 'away_mode_state_topic',
+    'b_tpl': 'blue_template',
     'bri_cmd_t': 'brightness_command_topic',
     'bri_scl': 'brightness_scale',
     'bri_stat_t': 'brightness_state_topic',
+    'bri_tpl': 'brightness_template',
     'bri_val_tpl': 'brightness_value_template',
     'clr_temp_cmd_tpl': 'color_temp_command_template',
     'bat_lev_t': 'battery_level_topic',
@@ -92,6 +94,8 @@ ABBREVIATIONS = {
     'clr_temp_val_tpl': 'color_temp_value_template',
     'cln_t': 'cleaning_topic',
     'cln_tpl': 'cleaning_template',
+    'cmd_off_tpl': 'command_off_template',
+    'cmd_on_tpl': 'command_on_template',
     'cmd_t': 'command_topic',
     'curr_temp_t': 'current_temperature_topic',
     'curr_temp_tpl': 'current_temperature_template',
@@ -107,12 +111,14 @@ ABBREVIATIONS = {
     'fx_cmd_t': 'effect_command_topic',
     'fx_list': 'effect_list',
     'fx_stat_t': 'effect_state_topic',
+    'fx_tpl': 'effect_template',
     'fx_val_tpl': 'effect_value_template',
     'exp_aft': 'expire_after',
     'fan_mode_cmd_t': 'fan_mode_command_topic',
     'fan_mode_stat_tpl': 'fan_mode_state_template',
     'fan_mode_stat_t': 'fan_mode_state_topic',
     'frc_upd': 'force_update',
+    'g_tpl': 'green_template',
     'hold_cmd_t': 'hold_command_topic',
     'hold_stat_tpl': 'hold_state_template',
     'hold_stat_t': 'hold_state_topic',
@@ -149,6 +155,7 @@ ABBREVIATIONS = {
     'pl_stop': 'payload_stop',
     'pl_unlk': 'payload_unlock',
     'pow_cmd_t': 'power_command_topic',
+    'r_tpl': 'red_template',
     'ret': 'retain',
     'rgb_cmd_tpl': 'rgb_command_template',
     'rgb_cmd_t': 'rgb_command_topic',
@@ -168,6 +175,7 @@ ABBREVIATIONS = {
     'stat_on': 'state_on',
     'stat_open': 'state_open',
     'stat_t': 'state_topic',
+    'stat_tpl': 'state_template',
     'stat_val_tpl': 'state_value_template',
     'sup_feat': 'supported_features',
     'swing_mode_cmd_t': 'swing_mode_command_topic',