Better type names.
Done for tonight.