Tiny fixes, package renaming