Fixed name generation.