Made some naming refactorings in restx-server modules