Renamed units to proper logic names