mappkgname: clean up package mapping dictionary

Signed-off-by: Euan Harris <euan.harris@citrix.com>