consistent clas and function names