Adding assertions against names that should be removed