change func names in estate