change namespace for server_ files