MONDRIAN-1771 - method name changes and documentation based on discussions this morning