New config screen is complete.

diff --git a/config.lua b/config.lua
index 34485f0..ca0593c 100644
--- a/config.lua
+++ b/config.lua
@@ -130,10 +130,10 @@ function configEvent:PLAYER_LOGIN()

 		if not value then
 			XCHT_DB.shortNames = false
-			DEFAULT_CHAT_FRAME:AddMessage(L.SlashShortNamesOn)
+			DEFAULT_CHAT_FRAME:AddMessage(L.SlashShortNamesOff)
 		else
 			XCHT_DB.shortNames = true
-			DEFAULT_CHAT_FRAME:AddMessage(L.SlashShortNamesOff)
+			DEFAULT_CHAT_FRAME:AddMessage(L.SlashShortNamesOn)
 		end

 		StaticPopup_Show("XANCHAT_APPLYCHANGES")
diff --git a/locale/enUS.lua b/locale/enUS.lua
index 09cc28d..cbcdf79 100644
--- a/locale/enUS.lua
+++ b/locale/enUS.lua
@@ -19,11 +19,11 @@ L.No = "No"

 --Channel Config (Only change the actual english word, leave the characters.  It's case sensitive!)
 L.ChannelGeneral = "%[%d+%. General.-%]"
-L.ChannelTrade = "%[%d+%. General.-%]"
-L.ChannelWorldDefense = "%[%d+%. General.-%]"
-L.ChannelLocalDefense = "%[%d+%. General.-%]"
-L.ChannelLookingForGroup = "%[%d+%. General.-%]"
-L.ChannelGuildRecruitment = "%[%d+%. General.-%]"
+L.ChannelTrade = "%[%d+%. Trade.-%]"
+L.ChannelWorldDefense = "%[%d+%. WorldDefense%]"
+L.ChannelLocalDefense = "%[%d+%. LocalDefense.-%]"
+L.ChannelLookingForGroup = "%[%d+%. LookingForGroup%]"
+L.ChannelGuildRecruitment = "%[%d+%. GuildRecruitment.-%]"

 L.ShortGeneral = "GN"
 L.ShortTrade = "TR"
@@ -31,7 +31,7 @@ L.ShortWorldDefense = "WD"
 L.ShortLocalDefense = "LD"
 L.ShortLookingForGroup = "LFG"
 L.ShortGuildRecruitment = "GR"
-
+
 --short channel globals
 --Example: "|Hchannel:  Channel Type   |h  [short channel name]   |h %s: "
 --Example Yell: "|Hchannel:  Yell  |h  [Y]  |h %s: "   Channel Type = Yell, short name = Y