Follow client naming convention