Moved events to consistant namespace and ensured they are all triggering properly