diff --git a/src/entity.lua b/src/entity.lua
index 5bfc88e..a3d6483 100644
--- a/src/entity.lua
+++ b/src/entity.lua
@@ -108,7 +108,7 @@ function Entity:assemble(assemblage, ...)
    return self
 end
 
-function Entity:flush()
+function Entity:__flush()
    local addi, removei = 1, 1
 
    for i = 1, #self.__operations do
diff --git a/src/world.lua b/src/world.lua
index 8a47aea..63ef1a9 100644
--- a/src/world.lua
+++ b/src/world.lua
@@ -76,7 +76,7 @@ function World:flush()
       e = self.entities:get(i)
 
       if e.__isDirty then
-         e:flush()
+         e:__flush()
 
          if (not e.__wasAdded) then -- The __wasAdded check below will handle this instead
             for j = 1, self.systems.size do