Refactor class named to better reflect there responsibility
Broken changes