Use correct disk names on HVM AMIs