change func names