Issue #174: renamed some methods for brevity