Updated names of functions