fix base package names, remove old names