rename package to match convention