Fixed some internal naming inconsistencies in binder.