Probably aws.amazon rather than webservices. They've invested a lot of time branding the acronym AWS, I don't see them rolling that back now.

As for whether they make those the new generic addresses... I'm not sure. I think they are more likely to use the new tld for internal dns and keep their existing public names.