Update clientId based on namespacing changes