Rename package and other fixes