Clean-up for logic_name overhaul