diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index 9f3429ed24..9e5f376b4f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 
                 if ((m_irc.Enabled) && (m_irc.Connected))
                 {
-                    string clientName = client.FirstName + " " + client.LastName;
+                    string clientName = client.Name;
                     // handles simple case. May not work for hundred connecting in per second.
                     // and the NewClients calles getting interleved
                     // but filters out multiple reports
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
index 6edc44de4a..f9e81f02ad 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
                     m_grouplistmap.Add(client.AgentId, testGroupList);
                 }
             }
-            m_log.Info("[GROUP]: Adding " + client.FirstName + " " + client.LastName + " to OpenSimulator Tester group");
+            m_log.Info("[GROUP]: Adding " + client.Name + " to OpenSimulator Tester group");
         }
 
         private void OnAgentDataUpdateRequest(IClientAPI remoteClient, LLUUID AgentID, LLUUID SessionID)
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups
                     IClientAPI cli = m_iclientmap[agentID];
                     if (cli != null)
                     {
-                        m_log.Info("[GROUP]: Removing all reference to groups for " + cli.FirstName + " " + cli.LastName);
+                        m_log.Info("[GROUP]: Removing all reference to groups for " + cli.Name);
                     }
                     else
                     {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
index 9121f7ac89..7a15708edc 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
         {
             DeliverMessage(e.Type,
                            e.Channel,
-                           e.Sender.FirstName + " " + e.Sender.LastName,
+                           e.Sender.Name,
                            e.Sender.AgentId,
                            e.Message);
         }
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 5800f70c90..b7f39ca801 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -787,7 +787,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     if (!presence.IsChildAgent)
                     {
-                        string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName;
+                        string name = presence.ControllingClient.Name;
 
                         if (String.Compare(avatarName, name, true) == 0)
                         {
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index a2c16b69c6..4050f3681d 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -6170,7 +6170,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             {
                 ScenePresence av = World.GetScenePresence(key);
                 
-                if (av != null);
+                if (av != null)
                 {
                     foreach (object o in args.Data)
                     {
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index b08a0fa9ef..3dbd88c6e4 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -331,7 +331,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                                                                  m_host.AbsolutePosition,
                                                                  m_host.Name, m_host.UUID);
                                 }
-                                catch (Exception f)
+                                catch (Exception)
                                 {
                                     //}
                                     //else