Refactor to clean up verbage across projects.