revise type names