cleanup package names.