CLOUD-194 Renamed facade to conform to the naming conventions