namespace and version tidy