diff --git a/include/types.hrl b/include/types.hrl
index d8e96a20e..f37d11a66 100644
--- a/include/types.hrl
+++ b/include/types.hrl
@@ -14,6 +14,8 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
+-define(Otherwise, true).
+
 -type(maybe(T) :: undefined | T).
 
 -type(startlink_ret() :: {ok, pid()} | ignore | {error, term()}).
diff --git a/src/emqx_channel.erl b/src/emqx_connection.erl
similarity index 100%
rename from src/emqx_channel.erl
rename to src/emqx_connection.erl
diff --git a/src/emqx_ws_channel.erl b/src/emqx_ws_connection.erl
similarity index 100%
rename from src/emqx_ws_channel.erl
rename to src/emqx_ws_connection.erl