Use new tagging conventions

http://confluence.guprod.gnm/display/WEB/Tagging+conventions+for+EC2+and+GC2