trying to make getFileName+addScope, consistent
wip
wip2