Issue #161: renamed some class and instance fields to conform to convention