General class name cleanup, spelling mistakes and FF decompile issues.