Name changes made and ready to implement.