Change tags naming conventions