Allow flexible naming for amd support (#933)