Fixed Tag Names not being correct