Normalize package name in all interactions with Maestro.mapping
Fix NameError and sending sentinel to finish uploaders properly