Fix hardcoded FQCNs in CategoryType