Rename package name to match convention