Updates to the new framework and updated some naming.