Rename package
Minor tweaks