Add stricter checking in NAME section