Minor changes in class and functions' names