More changes of the name of some old tables and functions to use the same name convention