Replaced fully qualified paths with their respective class names