Use more explicit name for class and functions