[Olena-patches] 579: Adjust guards to directory names.