Clean up name_new a bit.