[sr-dev] git:3.1: pkg: name fixes and cleanups, Patch from Claudio Furrer, elcaio at gmail dot com