Rename dialect functions and remove dialect