Fix name logic.