diff --git a/indra/llmessage/llavatarname.cpp b/indra/llmessage/llavatarname.cpp
index 2e8886fb51055d708a383d9126b41380804b04f8..7e1246f88578549f9b337be08c1ace0aed262b9a 100644
--- a/indra/llmessage/llavatarname.cpp
+++ b/indra/llmessage/llavatarname.cpp
@@ -166,10 +166,10 @@ void LLAvatarName::setExpires(F64 expires)
 	mExpires = LLFrameTimer::getTotalSeconds() + expires;
 }
 
-std::string LLAvatarName::getCompleteName(bool use_parentheses, bool force_use_display_name) const
+std::string LLAvatarName::getCompleteName(bool use_parentheses, bool force_use_complete_name) const
 {
 	std::string name;
-	if (sUseDisplayNames || force_use_display_name)
+	if (sUseDisplayNames || force_use_complete_name)
 	{
 		if (mUsername.empty() || mIsDisplayNameDefault)
 		{
@@ -180,7 +180,7 @@ std::string LLAvatarName::getCompleteName(bool use_parentheses, bool force_use_d
 		else
 		{
 			name = mDisplayName;
-			if(sUseUsernames)
+			if(sUseUsernames || force_use_complete_name)
 			{
 				if(use_parentheses)
 				{
diff --git a/indra/llmessage/llavatarname.h b/indra/llmessage/llavatarname.h
index 80b54cded9a13e4a82911712d2a4925e5f75fa3f..20f71407976d0b1fdbe32731d31bcab80ab96d29 100644
--- a/indra/llmessage/llavatarname.h
+++ b/indra/llmessage/llavatarname.h
@@ -65,7 +65,7 @@ class LL_COMMON_API LLAvatarName
 	
 	// For normal names, returns "James Linden (james.linden)"
 	// When display names are disabled returns just "James Linden"
-	std::string getCompleteName(bool use_parentheses = true, bool force_use_display_name = false) const;
+	std::string getCompleteName(bool use_parentheses = true, bool force_use_complete_name = false) const;
 	
 	// Returns "James Linden" or "bobsmith123 Resident" for backwards
 	// compatibility with systems like voice and muting