Fix/name source fix for #573

@bpinsard and @chrisfilo 

this is an attempt to clean this once and for all.  i've noted my thoughts here #573 and this PR attempts to fix that using option 3.