changed namespaces for helpers and activities