modify the func and type name