trying to make getFileName+addScope, consistent