Moved name selection strategies into its own class