Change some type names to make exported interface cleaner