Class name fix
Tasks #359 y #369