Removed internal calls to public functions, changed event types to properly named namespace, updated tests for passing new event names, minor text fixes and merged #517 to v4beta