Fix naming for the client modules.