Renamed function names and class names to become consistent with manual