package name tweak, build errors resolved