Merge "BUG-108: rename routes objects to prevent confusion"