Fixed tag and name errors