Renaming package and deleting other non-general uses.