Refractoring

Updated two function names.