refactor type names for clarity of use