Use namespaces and new class names in the tasks