Fix syntax errors and renamed a class