change the naming of several functions