Update some of the supporting files to work with our updated framework structure/naming.