First round of refactor changes; including general renaming.