CORE-4258 Fix folder rename in ClientDataModel.