wip: remove short_name, allow to customise name