some internal changes in names of functions