Changed tags names