After renaming packages, etc for the name changes, I missed a few. Fixed them and their references.