Merge branch 'egil/lttng-change-domain'

* egil/lttng-change-domain:
  runtime_tools: Change LTTng dyntrace domain
  erts: Change LTTng otp domain

3 files changed, 105 insertions, 105 deletions

diff --git a/lib/runtime_tools/c_src/dyntrace_lttng.h b/lib/runtime_tools/c_src/dyntrace_lttng.h
index 2a3224e191..5e838892d6 100644
--- a/lib/runtime_tools/c_src/dyntrace_lttng.h
+++ b/lib/runtime_tools/c_src/dyntrace_lttng.h
@@ -19,7 +19,7 @@
  */
 
 #undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER com_ericsson_dyntrace
+#define TRACEPOINT_PROVIDER org_erlang_dyntrace
 
 #if !defined(DYNTRACE_LTTNG_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define DYNTRACE_LTTNG_H
@@ -27,22 +27,22 @@
 #include <lttng/tracepoint.h>
 
 #define LTTNG1(Name, Arg1) \
-    tracepoint(com_ericsson_dyntrace, Name, (Arg1))
+    tracepoint(org_erlang_dyntrace, Name, (Arg1))
 
 #define LTTNG2(Name, Arg1, Arg2) \
-    tracepoint(com_ericsson_dyntrace, Name, (Arg1), (Arg2))
+    tracepoint(org_erlang_dyntrace, Name, (Arg1), (Arg2))
 
 #define LTTNG3(Name, Arg1, Arg2, Arg3) \
-    tracepoint(com_ericsson_dyntrace, Name, (Arg1), (Arg2), (Arg3))
+    tracepoint(org_erlang_dyntrace, Name, (Arg1), (Arg2), (Arg3))
 
 #define LTTNG4(Name, Arg1, Arg2, Arg3, Arg4) \
-    tracepoint(com_ericsson_dyntrace, Name, (Arg1), (Arg2), (Arg3), (Arg4))
+    tracepoint(org_erlang_dyntrace, Name, (Arg1), (Arg2), (Arg3), (Arg4))
 
 #define LTTNG5(Name, Arg1, Arg2, Arg3, Arg4, Arg5) \
-    tracepoint(com_ericsson_dyntrace, Name, (Arg1), (Arg2), (Arg3), (Arg4), (Arg5))
+    tracepoint(org_erlang_dyntrace, Name, (Arg1), (Arg2), (Arg3), (Arg4), (Arg5))
 
 #define LTTNG_ENABLED(Name) \
-    tracepoint_enabled(com_ericsson_dyntrace, Name)
+    tracepoint_enabled(org_erlang_dyntrace, Name)
 
 #define LTTNG_BUFFER_SZ      (256)
 #define LTTNG_PROC_BUFFER_SZ (16)
@@ -76,7 +76,7 @@
 /* Process scheduling */
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     process_spawn,
     TP_ARGS(
         char*, p,
@@ -91,7 +91,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     process_link,
     TP_ARGS(
         char*, from,
@@ -106,7 +106,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     process_exit,
     TP_ARGS(
         char*, p,
@@ -119,7 +119,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     process_register,
     TP_ARGS(
         char*, pid,
@@ -136,7 +136,7 @@ TRACEPOINT_EVENT(
 /* Scheduled */
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     process_scheduled,
     TP_ARGS(
         char*, p,
@@ -154,7 +154,7 @@ TRACEPOINT_EVENT(
 
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     port_open,
     TP_ARGS(
         char*, pid,
@@ -169,7 +169,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     port_exit,
     TP_ARGS(
         char*, port,
@@ -182,7 +182,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     port_link,
     TP_ARGS(
         char*, from,
@@ -197,7 +197,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     port_scheduled,
     TP_ARGS(
         char*, p,
@@ -214,7 +214,7 @@ TRACEPOINT_EVENT(
 /* Call tracing */
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     function_call,
     TP_ARGS(
         char*, pid,
@@ -229,7 +229,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     function_return,
     TP_ARGS(
         char*, pid,
@@ -244,7 +244,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     function_exception,
     TP_ARGS(
         char*, pid,
@@ -261,7 +261,7 @@ TRACEPOINT_EVENT(
 /* Process messages */
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     message_send,
     TP_ARGS(
         char*, sender,
@@ -276,7 +276,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     message_receive,
     TP_ARGS(
         char*, receiver,
@@ -291,7 +291,7 @@ TRACEPOINT_EVENT(
 /* Process Memory */
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     gc_minor_start,
     TP_ARGS(
         char*, p,
@@ -308,7 +308,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     gc_minor_end,
     TP_ARGS(
         char*, p,
@@ -325,7 +325,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     gc_major_start,
     TP_ARGS(
         char*, p,
@@ -342,7 +342,7 @@ TRACEPOINT_EVENT(
 )
 
 TRACEPOINT_EVENT(
-    com_ericsson_dyntrace,
+    org_erlang_dyntrace,
     gc_major_end,
     TP_ARGS(
         char*, p,
diff --git a/lib/runtime_tools/doc/src/LTTng.xml b/lib/runtime_tools/doc/src/LTTng.xml
index 9b490a27a0..82a4c79379 100644
--- a/lib/runtime_tools/doc/src/LTTng.xml
+++ b/lib/runtime_tools/doc/src/LTTng.xml
@@ -66,7 +66,7 @@ $ make </code>
 
     <section>
         <title>Dyntrace Tracepoints</title>
-        <p>All tracepoints are in the domain of <c>com_ericsson_dyntrace</c></p>
+        <p>All tracepoints are in the domain of <c>org_erlang_dyntrace</c></p>
         <p>All Erlang types are the string equivalent in LTTng.</p>
 
         <p><em>process_spawn</em></p>
@@ -310,7 +310,7 @@ $ make </code>
 
     <section>
         <title>BEAM Tracepoints</title>
-        <p>All tracepoints are in the domain of <c>com_ericsson_otp</c></p>
+        <p>All tracepoints are in the domain of <c>org_erlang_otp</c></p>
         <p>All Erlang types are the string equivalent in LTTng.</p>
 
         <p><em>scheduler_poll</em></p>
@@ -550,8 +550,8 @@ Eshell V8.0  (abort with ^G)
 
      <p>Enable the process_register LTTng tracepoint for Erlang.</p>
 
-     <pre>$ lttng enable-event -u com_ericsson_dyntrace:process_register
-UST event com_ericsson_dyntrace:process_register created in channel channel0</pre>
+     <pre>$ lttng enable-event -u org_erlang_dyntrace:process_register
+UST event org_erlang_dyntrace:process_register created in channel channel0</pre>
 
      <p>Enable process tracing for new processes and use <c>dyntrace</c> as tracer backend.</p>
 
@@ -573,23 +573,23 @@ Tracing started for session erlang-demo</pre>
      <pre>$ lttng stop
 Tracing stopped for session erlang-demo
 $ lttng view
-[17:20:42.561168759] (+?.?????????) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.561168759] (+?.?????????) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.66.0&gt;", name = "sasl_sup", type = "register" }
-[17:20:42.561215519] (+0.000046760) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.561215519] (+0.000046760) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.67.0&gt;", name = "sasl_safe_sup", type = "register" }
-[17:20:42.562149024] (+0.000933505) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.562149024] (+0.000933505) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.68.0&gt;", name = "alarm_handler", type = "register" }
-[17:20:42.571035803] (+0.008886779) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.571035803] (+0.008886779) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.69.0&gt;", name = "release_handler", type = "register" }
-[17:20:42.574939868] (+0.003904065) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.574939868] (+0.003904065) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.74.0&gt;", name = "os_mon_sup", type = "register" }
-[17:20:42.576818712] (+0.001878844) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.576818712] (+0.001878844) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.75.0&gt;", name = "disksup", type = "register" }
-[17:20:42.580032013] (+0.003213301) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.580032013] (+0.003213301) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.76.0&gt;", name = "memsup", type = "register" }
-[17:20:42.583046339] (+0.003014326) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.583046339] (+0.003014326) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.78.0&gt;", name = "cpu_sup", type = "register" }
-[17:20:42.586206242] (+0.003159903) elxd1168lx9 com_ericsson_dyntrace:process_register: \
+[17:20:42.586206242] (+0.003159903) elxd1168lx9 org_erlang_dyntrace:process_register: \
     { cpu_id = 5 }, { pid = "&lt;0.82.0&gt;", name = "timer_server", type = "register" }</pre>
     </section>
 </chapter>
diff --git a/lib/runtime_tools/test/dyntrace_lttng_SUITE.erl b/lib/runtime_tools/test/dyntrace_lttng_SUITE.erl
index 07707c6a12..a98ac6e99c 100644
--- a/lib/runtime_tools/test/dyntrace_lttng_SUITE.erl
+++ b/lib/runtime_tools/test/dyntrace_lttng_SUITE.erl
@@ -84,25 +84,25 @@ end_per_testcase(Case, _Config) ->
 
 %% tracepoints
 %%
-%%  com_ericsson_dyntrace:gc_major_end
-%%  com_ericsson_dyntrace:gc_major_start
-%%  com_ericsson_dyntrace:gc_minor_end
-%%  com_ericsson_dyntrace:gc_minor_start
-%%  com_ericsson_dyntrace:message_receive
-%%  com_ericsson_dyntrace:message_send
-%%  -com_ericsson_dyntrace:message_queued
-%%  com_ericsson_dyntrace:function_exception
-%%  com_ericsson_dyntrace:function_return
-%%  com_ericsson_dyntrace:function_call
-%%  com_ericsson_dyntrace:port_link
-%%  com_ericsson_dyntrace:port_exit
-%%  com_ericsson_dyntrace:port_open
-%%  com_ericsson_dyntrace:port_scheduled
-%%  com_ericsson_dyntrace:process_scheduled
-%%  com_ericsson_dyntrace:process_register
-%%  com_ericsson_dyntrace:process_exit
-%%  com_ericsson_dyntrace:process_link
-%%  com_ericsson_dyntrace:process_spawn
+%%  org_erlang_dyntrace:gc_major_end
+%%  org_erlang_dyntrace:gc_major_start
+%%  org_erlang_dyntrace:gc_minor_end
+%%  org_erlang_dyntrace:gc_minor_start
+%%  org_erlang_dyntrace:message_receive
+%%  org_erlang_dyntrace:message_send
+%%  -org_erlang_dyntrace:message_queued
+%%  org_erlang_dyntrace:function_exception
+%%  org_erlang_dyntrace:function_return
+%%  org_erlang_dyntrace:function_call
+%%  org_erlang_dyntrace:port_link
+%%  org_erlang_dyntrace:port_exit
+%%  org_erlang_dyntrace:port_open
+%%  org_erlang_dyntrace:port_scheduled
+%%  org_erlang_dyntrace:process_scheduled
+%%  org_erlang_dyntrace:process_register
+%%  org_erlang_dyntrace:process_exit
+%%  org_erlang_dyntrace:process_link
+%%  org_erlang_dyntrace:process_spawn
 %%
 %% Testcases
 %%
@@ -112,7 +112,7 @@ t_lttng_list(_Config) ->
     ok.
 
 t_procs(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:process_*", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:process_*", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},procs]),
 
     Pid = spawn_link(fun() -> waiter() end),
@@ -122,27 +122,27 @@ t_procs(Config) when is_list(Config) ->
 
     _ = erlang:trace(all, false, [procs]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_spawn", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_link", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_exit", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_register", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_spawn", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_link", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_exit", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_register", Res),
     ok.
 
 t_ports(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:port_*", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:port_*", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},ports]),
 
     _ = os:cmd("ls"),
 
     _ = erlang:trace(all, false, [{tracer, dyntrace, []},ports]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_open", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_link", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_exit", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_open", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_link", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_exit", Res),
     ok.
 
 t_running_process(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:process_scheduled", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:process_scheduled", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},running]),
 
     Pid = spawn_link(fun() -> waiter() end),
@@ -152,11 +152,11 @@ t_running_process(Config) when is_list(Config) ->
 
     _ = erlang:trace(all, false, [running]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_scheduled", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_scheduled", Res),
     ok.
 
 t_running_port(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:port_scheduled", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:port_scheduled", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},running_ports]),
 
     _ = os:cmd("ls"),
@@ -164,12 +164,12 @@ t_running_port(Config) when is_list(Config) ->
 
     _ = erlang:trace(all, false, [running_ports]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_scheduled", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_scheduled", Res),
     ok.
 
 
 t_call(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:function_*", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:function_*", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []}, call]),
     _ = erlang:trace_pattern({?MODULE, '_', '_'}, [{'_',[],[{exception_trace}]}], [local]),
 
@@ -184,13 +184,13 @@ t_call(Config) when is_list(Config) ->
     _ = erlang:trace_pattern({?MODULE, '_', '_'}, false, [local]),
     _ = erlang:trace(all, false, [call]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:function_call", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:function_return", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:function_exception", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:function_call", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:function_return", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:function_exception", Res),
     ok.
 
 t_send(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:message_send", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:message_send", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},send]),
 
     Pid = spawn_link(fun() -> waiter() end),
@@ -201,11 +201,11 @@ t_send(Config) when is_list(Config) ->
 
     _ = erlang:trace(all, false, [send]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:message_send", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:message_send", Res),
     ok.
 
 t_call_return_to(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:function_*", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:function_*", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []}, call, return_to]),
     _ = erlang:trace_pattern({lists, '_', '_'}, true, [local]),
     _ = erlang:trace_pattern({?MODULE, '_', '_'}, true, [local]),
@@ -219,11 +219,11 @@ t_call_return_to(Config) when is_list(Config) ->
     _ = erlang:trace_pattern({lists, '_', '_'}, false, [local]),
     _ = erlang:trace(all, false, [call,return_to]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:function_call", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:function_call", Res),
     ok.
 
 t_call_silent(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:function_*", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:function_*", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []}, call, silent]),
     _ = erlang:trace_pattern({?MODULE, '_', '_'}, [{'_',[],[{exception_trace}]}], [local]),
 
@@ -238,14 +238,14 @@ t_call_silent(Config) when is_list(Config) ->
     _ = erlang:trace_pattern({?MODULE, '_', '_'}, false, [local]),
     _ = erlang:trace(all, false, [call]),
     Res = lttng_stop_and_view(Config),
-    notfound = check_tracepoint("com_ericsson_dyntrace:function_call", Res),
-    notfound = check_tracepoint("com_ericsson_dyntrace:function_return", Res),
-    notfound = check_tracepoint("com_ericsson_dyntrace:function_exception", Res),
+    notfound = check_tracepoint("org_erlang_dyntrace:function_call", Res),
+    notfound = check_tracepoint("org_erlang_dyntrace:function_return", Res),
+    notfound = check_tracepoint("org_erlang_dyntrace:function_exception", Res),
     ok.
 
 
 t_receive(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:message_receive", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:message_receive", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},'receive']),
     timer:sleep(20),
 
@@ -260,11 +260,11 @@ t_receive(Config) when is_list(Config) ->
     timer:sleep(10),
     _ = erlang:trace(all, false, ['receive']),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:message_receive", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:message_receive", Res),
     ok.
 
 t_garbage_collection(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:gc_*", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:gc_*", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},garbage_collection]),
 
     Pid = spawn_link(fun() -> gcfier() end),
@@ -273,14 +273,14 @@ t_garbage_collection(Config) when is_list(Config) ->
     timer:sleep(10),
     _ = erlang:trace(all, false, [garbage_collection]),
     Res = lttng_stop_and_view(Config),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_major_start", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_major_end", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_minor_start", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_minor_end", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_major_start", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_major_end", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_minor_start", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_minor_end", Res),
     ok.
 
 t_all(Config) when is_list(Config) ->
-    ok = lttng_start_event("com_ericsson_dyntrace:*", Config),
+    ok = lttng_start_event("org_erlang_dyntrace:*", Config),
     _ = erlang:trace(new, true, [{tracer, dyntrace, []},all]),
 
     Pid1 = spawn_link(fun() -> waiter() end),
@@ -297,21 +297,21 @@ t_all(Config) when is_list(Config) ->
     _ = erlang:trace(all, false, [all]),
     Res = lttng_stop_and_view(Config),
 
-    ok = check_tracepoint("com_ericsson_dyntrace:process_spawn", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_link", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_exit", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_register", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_open", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_link", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_exit", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:process_scheduled", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:port_scheduled", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:message_send", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:message_receive", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_major_start", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_major_end", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_minor_start", Res),
-    ok = check_tracepoint("com_ericsson_dyntrace:gc_minor_end", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_spawn", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_link", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_exit", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_register", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_open", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_link", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_exit", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:process_scheduled", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:port_scheduled", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:message_send", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:message_receive", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_major_start", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_major_end", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_minor_start", Res),
+    ok = check_tracepoint("org_erlang_dyntrace:gc_minor_end", Res),
     ok.