Small changes to the NamingStarter