Revert "swapping order of parameter substitution in getEffectiveClientName so"

This reverts commit 4fa7dd88c033546eb52980f3e5cac89578bc45fa.
Revert "Revert "swapping order of parameter substitution in getEffectiveClientName so""

This reverts commit 2d8a0fde6acd0f402fd58ba7263a3f0f632d79b0.
Revert "Revert "Revert "swapping order of parameter substitution in getEffectiveClientName so"""

This reverts commit 493d8e2f783cd14f5416ba2211d3b47ccae38c9d.