cleaning up names/methodNames in core
cleaning up names/methodNames in core


Former-commit-id: a88a9265f784d747a1d029707141578419a310a1 [formerly 6a44e2db3353023d558d6f44648c6f7d71d72c86]
Former-commit-id: 503710672ed678c10b770a09895ea4dc361dc416
andrewplummer/Sugar,romancow/Sugar,romancow/Sugar,andrewplummer/Sugar