Put back inconsistent names :(

Names are hardcoded to ids in packages