function and class name changed