removed anachronistic name logic