simplify descriptor file naming