Fix: Avoid FQCN