diff --git a/lua/neorg/modules/core/autocommands/module.lua b/lua/neorg/modules/core/autocommands/module.lua
index 5cae451de..5ec9b396c 100644
--- a/lua/neorg/modules/core/autocommands/module.lua
+++ b/lua/neorg/modules/core/autocommands/module.lua
@@ -52,7 +52,7 @@ function _neorg_module_autocommand_triggered(name, triggered_from_norg, ev)
 end
 
 -- A convenience wrapper around modules.define_event_event
-module.autocmd_base = function(name)
+module.private.autocmd_base = function(name)
     return modules.define_event(module, name)
 end
 
@@ -216,118 +216,118 @@ module.events.subscribed = {
 -- All the autocommand definitions
 module.events.defined = {
 
-    bufadd = module.autocmd_base("bufadd"),
-    bufdelete = module.autocmd_base("bufdelete"),
-    bufenter = module.autocmd_base("bufenter"),
-    buffilepost = module.autocmd_base("buffilepost"),
-    buffilepre = module.autocmd_base("buffilepre"),
-    bufhidden = module.autocmd_base("bufhidden"),
-    bufleave = module.autocmd_base("bufleave"),
-    bufmodifiedset = module.autocmd_base("bufmodifiedset"),
-    bufnew = module.autocmd_base("bufnew"),
-    bufnewfile = module.autocmd_base("bufnewfile"),
-    bufreadpost = module.autocmd_base("bufreadpost"),
-    bufreadcmd = module.autocmd_base("bufreadcmd"),
-    bufreadpre = module.autocmd_base("bufreadpre"),
-    bufunload = module.autocmd_base("bufunload"),
-    bufwinenter = module.autocmd_base("bufwinenter"),
-    bufwinleave = module.autocmd_base("bufwinleave"),
-    bufwipeout = module.autocmd_base("bufwipeout"),
-    bufwrite = module.autocmd_base("bufwrite"),
-    bufwritecmd = module.autocmd_base("bufwritecmd"),
-    bufwritepost = module.autocmd_base("bufwritepost"),
-    chaninfo = module.autocmd_base("chaninfo"),
-    chanopen = module.autocmd_base("chanopen"),
-    cmdundefined = module.autocmd_base("cmdundefined"),
-    cmdlinechanged = module.autocmd_base("cmdlinechanged"),
-    cmdlineenter = module.autocmd_base("cmdlineenter"),
-    cmdlineleave = module.autocmd_base("cmdlineleave"),
-    cmdwinenter = module.autocmd_base("cmdwinenter"),
-    cmdwinleave = module.autocmd_base("cmdwinleave"),
-    colorscheme = module.autocmd_base("colorscheme"),
-    colorschemepre = module.autocmd_base("colorschemepre"),
-    completechanged = module.autocmd_base("completechanged"),
-    completedonepre = module.autocmd_base("completedonepre"),
-    completedone = module.autocmd_base("completedone"),
-    cursorhold = module.autocmd_base("cursorhold"),
-    cursorholdi = module.autocmd_base("cursorholdi"),
-    cursormoved = module.autocmd_base("cursormoved"),
-    cursormovedi = module.autocmd_base("cursormovedi"),
-    diffupdated = module.autocmd_base("diffupdated"),
-    dirchanged = module.autocmd_base("dirchanged"),
-    fileappendcmd = module.autocmd_base("fileappendcmd"),
-    fileappendpost = module.autocmd_base("fileappendpost"),
-    fileappendpre = module.autocmd_base("fileappendpre"),
-    filechangedro = module.autocmd_base("filechangedro"),
-    exitpre = module.autocmd_base("exitpre"),
-    filechangedshell = module.autocmd_base("filechangedshell"),
-    filechangedshellpost = module.autocmd_base("filechangedshellpost"),
-    filereadcmd = module.autocmd_base("filereadcmd"),
-    filereadpost = module.autocmd_base("filereadpost"),
-    filereadpre = module.autocmd_base("filereadpre"),
-    filetype = module.autocmd_base("filetype"),
-    filewritecmd = module.autocmd_base("filewritecmd"),
-    filewritepost = module.autocmd_base("filewritepost"),
-    filewritepre = module.autocmd_base("filewritepre"),
-    filterreadpost = module.autocmd_base("filterreadpost"),
-    filterreadpre = module.autocmd_base("filterreadpre"),
-    filterwritepost = module.autocmd_base("filterwritepost"),
-    filterwritepre = module.autocmd_base("filterwritepre"),
-    focusgained = module.autocmd_base("focusgained"),
-    focuslost = module.autocmd_base("focuslost"),
-    funcundefined = module.autocmd_base("funcundefined"),
-    uienter = module.autocmd_base("uienter"),
-    uileave = module.autocmd_base("uileave"),
-    insertchange = module.autocmd_base("insertchange"),
-    insertcharpre = module.autocmd_base("insertcharpre"),
-    textyankpost = module.autocmd_base("textyankpost"),
-    insertenter = module.autocmd_base("insertenter"),
-    insertleavepre = module.autocmd_base("insertleavepre"),
-    insertleave = module.autocmd_base("insertleave"),
-    menupopup = module.autocmd_base("menupopup"),
-    optionset = module.autocmd_base("optionset"),
-    quickfixcmdpre = module.autocmd_base("quickfixcmdpre"),
-    quickfixcmdpost = module.autocmd_base("quickfixcmdpost"),
-    quitpre = module.autocmd_base("quitpre"),
-    remotereply = module.autocmd_base("remotereply"),
-    sessionloadpost = module.autocmd_base("sessionloadpost"),
-    shellcmdpost = module.autocmd_base("shellcmdpost"),
-    signal = module.autocmd_base("signal"),
-    shellfilterpost = module.autocmd_base("shellfilterpost"),
-    sourcepre = module.autocmd_base("sourcepre"),
-    sourcepost = module.autocmd_base("sourcepost"),
-    sourcecmd = module.autocmd_base("sourcecmd"),
-    spellfilemissing = module.autocmd_base("spellfilemissing"),
-    stdinreadpost = module.autocmd_base("stdinreadpost"),
-    stdinreadpre = module.autocmd_base("stdinreadpre"),
-    swapexists = module.autocmd_base("swapexists"),
-    syntax = module.autocmd_base("syntax"),
-    tabenter = module.autocmd_base("tabenter"),
-    tableave = module.autocmd_base("tableave"),
-    tabnew = module.autocmd_base("tabnew"),
-    tabnewentered = module.autocmd_base("tabnewentered"),
-    tabclosed = module.autocmd_base("tabclosed"),
-    termopen = module.autocmd_base("termopen"),
-    termenter = module.autocmd_base("termenter"),
-    termleave = module.autocmd_base("termleave"),
-    termclose = module.autocmd_base("termclose"),
-    termresponse = module.autocmd_base("termresponse"),
-    textchanged = module.autocmd_base("textchanged"),
-    textchangedi = module.autocmd_base("textchangedi"),
-    textchangedp = module.autocmd_base("textchangedp"),
-    user = module.autocmd_base("user"),
-    usergettingbored = module.autocmd_base("usergettingbored"),
-    vimenter = module.autocmd_base("vimenter"),
-    vimleave = module.autocmd_base("vimleave"),
-    vimleavepre = module.autocmd_base("vimleavepre"),
-    vimresized = module.autocmd_base("vimresized"),
-    vimresume = module.autocmd_base("vimresume"),
-    vimsuspend = module.autocmd_base("vimsuspend"),
-    winclosed = module.autocmd_base("winclosed"),
-    winenter = module.autocmd_base("winenter"),
-    winleave = module.autocmd_base("winleave"),
-    winnew = module.autocmd_base("winnew"),
-    winscrolled = module.autocmd_base("winscrolled"),
+    bufadd = module.private.autocmd_base("bufadd"),
+    bufdelete = module.private.autocmd_base("bufdelete"),
+    bufenter = module.private.autocmd_base("bufenter"),
+    buffilepost = module.private.autocmd_base("buffilepost"),
+    buffilepre = module.private.autocmd_base("buffilepre"),
+    bufhidden = module.private.autocmd_base("bufhidden"),
+    bufleave = module.private.autocmd_base("bufleave"),
+    bufmodifiedset = module.private.autocmd_base("bufmodifiedset"),
+    bufnew = module.private.autocmd_base("bufnew"),
+    bufnewfile = module.private.autocmd_base("bufnewfile"),
+    bufreadpost = module.private.autocmd_base("bufreadpost"),
+    bufreadcmd = module.private.autocmd_base("bufreadcmd"),
+    bufreadpre = module.private.autocmd_base("bufreadpre"),
+    bufunload = module.private.autocmd_base("bufunload"),
+    bufwinenter = module.private.autocmd_base("bufwinenter"),
+    bufwinleave = module.private.autocmd_base("bufwinleave"),
+    bufwipeout = module.private.autocmd_base("bufwipeout"),
+    bufwrite = module.private.autocmd_base("bufwrite"),
+    bufwritecmd = module.private.autocmd_base("bufwritecmd"),
+    bufwritepost = module.private.autocmd_base("bufwritepost"),
+    chaninfo = module.private.autocmd_base("chaninfo"),
+    chanopen = module.private.autocmd_base("chanopen"),
+    cmdundefined = module.private.autocmd_base("cmdundefined"),
+    cmdlinechanged = module.private.autocmd_base("cmdlinechanged"),
+    cmdlineenter = module.private.autocmd_base("cmdlineenter"),
+    cmdlineleave = module.private.autocmd_base("cmdlineleave"),
+    cmdwinenter = module.private.autocmd_base("cmdwinenter"),
+    cmdwinleave = module.private.autocmd_base("cmdwinleave"),
+    colorscheme = module.private.autocmd_base("colorscheme"),
+    colorschemepre = module.private.autocmd_base("colorschemepre"),
+    completechanged = module.private.autocmd_base("completechanged"),
+    completedonepre = module.private.autocmd_base("completedonepre"),
+    completedone = module.private.autocmd_base("completedone"),
+    cursorhold = module.private.autocmd_base("cursorhold"),
+    cursorholdi = module.private.autocmd_base("cursorholdi"),
+    cursormoved = module.private.autocmd_base("cursormoved"),
+    cursormovedi = module.private.autocmd_base("cursormovedi"),
+    diffupdated = module.private.autocmd_base("diffupdated"),
+    dirchanged = module.private.autocmd_base("dirchanged"),
+    fileappendcmd = module.private.autocmd_base("fileappendcmd"),
+    fileappendpost = module.private.autocmd_base("fileappendpost"),
+    fileappendpre = module.private.autocmd_base("fileappendpre"),
+    filechangedro = module.private.autocmd_base("filechangedro"),
+    exitpre = module.private.autocmd_base("exitpre"),
+    filechangedshell = module.private.autocmd_base("filechangedshell"),
+    filechangedshellpost = module.private.autocmd_base("filechangedshellpost"),
+    filereadcmd = module.private.autocmd_base("filereadcmd"),
+    filereadpost = module.private.autocmd_base("filereadpost"),
+    filereadpre = module.private.autocmd_base("filereadpre"),
+    filetype = module.private.autocmd_base("filetype"),
+    filewritecmd = module.private.autocmd_base("filewritecmd"),
+    filewritepost = module.private.autocmd_base("filewritepost"),
+    filewritepre = module.private.autocmd_base("filewritepre"),
+    filterreadpost = module.private.autocmd_base("filterreadpost"),
+    filterreadpre = module.private.autocmd_base("filterreadpre"),
+    filterwritepost = module.private.autocmd_base("filterwritepost"),
+    filterwritepre = module.private.autocmd_base("filterwritepre"),
+    focusgained = module.private.autocmd_base("focusgained"),
+    focuslost = module.private.autocmd_base("focuslost"),
+    funcundefined = module.private.autocmd_base("funcundefined"),
+    uienter = module.private.autocmd_base("uienter"),
+    uileave = module.private.autocmd_base("uileave"),
+    insertchange = module.private.autocmd_base("insertchange"),
+    insertcharpre = module.private.autocmd_base("insertcharpre"),
+    textyankpost = module.private.autocmd_base("textyankpost"),
+    insertenter = module.private.autocmd_base("insertenter"),
+    insertleavepre = module.private.autocmd_base("insertleavepre"),
+    insertleave = module.private.autocmd_base("insertleave"),
+    menupopup = module.private.autocmd_base("menupopup"),
+    optionset = module.private.autocmd_base("optionset"),
+    quickfixcmdpre = module.private.autocmd_base("quickfixcmdpre"),
+    quickfixcmdpost = module.private.autocmd_base("quickfixcmdpost"),
+    quitpre = module.private.autocmd_base("quitpre"),
+    remotereply = module.private.autocmd_base("remotereply"),
+    sessionloadpost = module.private.autocmd_base("sessionloadpost"),
+    shellcmdpost = module.private.autocmd_base("shellcmdpost"),
+    signal = module.private.autocmd_base("signal"),
+    shellfilterpost = module.private.autocmd_base("shellfilterpost"),
+    sourcepre = module.private.autocmd_base("sourcepre"),
+    sourcepost = module.private.autocmd_base("sourcepost"),
+    sourcecmd = module.private.autocmd_base("sourcecmd"),
+    spellfilemissing = module.private.autocmd_base("spellfilemissing"),
+    stdinreadpost = module.private.autocmd_base("stdinreadpost"),
+    stdinreadpre = module.private.autocmd_base("stdinreadpre"),
+    swapexists = module.private.autocmd_base("swapexists"),
+    syntax = module.private.autocmd_base("syntax"),
+    tabenter = module.private.autocmd_base("tabenter"),
+    tableave = module.private.autocmd_base("tableave"),
+    tabnew = module.private.autocmd_base("tabnew"),
+    tabnewentered = module.private.autocmd_base("tabnewentered"),
+    tabclosed = module.private.autocmd_base("tabclosed"),
+    termopen = module.private.autocmd_base("termopen"),
+    termenter = module.private.autocmd_base("termenter"),
+    termleave = module.private.autocmd_base("termleave"),
+    termclose = module.private.autocmd_base("termclose"),
+    termresponse = module.private.autocmd_base("termresponse"),
+    textchanged = module.private.autocmd_base("textchanged"),
+    textchangedi = module.private.autocmd_base("textchangedi"),
+    textchangedp = module.private.autocmd_base("textchangedp"),
+    user = module.private.autocmd_base("user"),
+    usergettingbored = module.private.autocmd_base("usergettingbored"),
+    vimenter = module.private.autocmd_base("vimenter"),
+    vimleave = module.private.autocmd_base("vimleave"),
+    vimleavepre = module.private.autocmd_base("vimleavepre"),
+    vimresized = module.private.autocmd_base("vimresized"),
+    vimresume = module.private.autocmd_base("vimresume"),
+    vimsuspend = module.private.autocmd_base("vimsuspend"),
+    winclosed = module.private.autocmd_base("winclosed"),
+    winenter = module.private.autocmd_base("winenter"),
+    winleave = module.private.autocmd_base("winleave"),
+    winnew = module.private.autocmd_base("winnew"),
+    winscrolled = module.private.autocmd_base("winscrolled"),
 }
 
 module.examples = {