More agnostic path names in amd definition.