small name changes
small name changes


Former-commit-id: e1a855bad5bf4e28520933dee666223bfc5930da [formerly 6e46aa67b01a3155d12967dc51f936c24a8c39dd]
Former-commit-id: 09ffe268c8adabf6997b45cc2c14b2e4342490e4
andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar,romancow/Sugar