func and var rename update