#2486 Renaming functions.
#2486
2018-05-14, dporopat