pkg: name fixes and cleanups, Patch from Claudio Furrer, elcaio at gmail dot com