rework type names