[CLC-1586] Naming, logic fixes