First cut at refactoring to keep nomenclature consistent with the talk.