stop use namespace-package: rename some import