Names: fix criticals.