More renaming/tweaking of package