Now using name_source etc., both new interfaces