Update README to follow new naming. Improve AWS section.