LPS-32400 - Simplify naming for all tags