Naming of functions and tooltip added