Users can override generated name for custom naming

this should be combined with line above ?