Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
What is this ```client-``` part for? We don't have ```create-map-client-```. Shouldn't they be consistent?