changes in functions names. minimum change.