updating ec2 tag keys to match other EC2 libraries

This is just a suggested change to make the tag keys match a little more with the API and other libraries. Within the EC2 API itself, there are multiple "ids" and "types", so IMO this is a little clearer.