Fix client id based on namespacing changes