Previous commit (c1faf978ee) completely removed hierarchical element naming, so let's put that back in