Fixes #1605 - Aligns Client name with description