Remove wrong name checking