diff --git a/export/__init__.py b/export/__init__.py
index 87442ac6..19577baf 100644
--- a/export/__init__.py
+++ b/export/__init__.py
@@ -3,7 +3,7 @@
 from .. import utils
 from . import (
     blender_object, caches, camera, config, duplis,
-    imagepipeline, light, material, motion_blur, particle, world
+    imagepipeline, light, material, motion_blur, hair, world
 )
 from .light import WORLD_BACKGROUND_LIGHT_NAME
 
@@ -253,7 +253,7 @@ def _convert_object(self, props, obj, scene, context, luxcore_scene,
             settings = psys.settings
             # render_type OBJECT and GROUP are handled by duplis.convert() above
             if settings.type == "HAIR" and settings.render_type == "PATH":
-                particle.convert_hair(obj, psys, luxcore_scene, scene, context, engine)
+                hair.convert_hair(obj, psys, luxcore_scene, scene, context, engine)
                 
         if exported_obj is None:
             # Object is not visible or an error happened.
diff --git a/export/duplis.py b/export/duplis.py
index dffab41d..38beb3ac 100644
--- a/export/duplis.py
+++ b/export/duplis.py
@@ -17,6 +17,9 @@ def add(self, matrix):
 
 
 def convert(blender_obj, scene, context, luxcore_scene, engine=None):
+    """
+    Converts particle systems and dupliverts/faces (everything apart from hair)
+    """
     try:
         assert blender_obj.is_duplicator
 
@@ -105,7 +108,7 @@ def convert(blender_obj, scene, context, luxcore_scene, engine=None):
 
         print("Dupli export took %.3fs" % (time() - start))
     except Exception as error:
-        msg = "[%s] %s" % (blender_obj.name, error)
+        msg = '[Duplicator "%s"] %s' % (blender_obj.name, error)
         scene.luxcore.errorlog.add_warning(msg)
         import traceback
         traceback.print_exc()
diff --git a/export/particle.py b/export/hair.py
similarity index 100%
rename from export/particle.py
rename to export/hair.py