renamed function and type names