change the package name to uniform form