Use package key
Remove ipdb import
Add missing keys
Use shortname
Change samples to use new models