[TASK] Simplify fully qualified class names