Refactor client Facade and MainController - fix names of methods