Updated alert naming conventions

Allows for better flexibility and reduces conflicts