Removed client/server namespaces for recoding