Fix func names in org