fix the name and angle bracket matter