Renames variables to make logic easier to understand. re #2725
Renames variables to make logic easier to understand. re #2725

archesproject/arches,archesproject/arches,archesproject/arches,archesproject/arches