Changes to class naming to make it compatible with the FABtotum plugin system