fixing matched annotations now that I changed the package names