Changed tag underscores to hyphens