BUG-4638: fix typedef types