refactor: shortened type names