Rename classes to be more sensible.