Fix task types

As they are not anymore "named" ones, but FQCN