Change XML name of tags to match EC2 documentation