Export more types after renaming and cleanup