Added NameChooser and fixed imports