Clean up GenericName