Use generic name for configure wrapper also