Improved naming of several functions