All ambiguous names changed, helpers fixed with callbacks.