gras: rename some factory functions