Remove hard-coding, in favour of using the existing argument that passes the name
Splitting off part of !40082 (closed)