Move Name into its own group