Fixed some class and variable names