Remove code duplicate
Refactore class name with namespace