Tweaked a couple tag names