Changed logic names to scenario