Rename package to fit convention