Rename things to reflect current package