fixing the build, conflicting field/method names