Updated naming convention of functions to a better structured one