Default facade name fixed, in case of singleton.
Bug with mediator fixed.