Update to use fully qualified class names