Renaming various classes to make their function clearer.