diff --git a/mrq/agent.py b/mrq/agent.py
index 9bb13872..f3aa5f4f 100644
--- a/mrq/agent.py
+++ b/mrq/agent.py
@@ -12,7 +12,8 @@
 try:
     from redis.lock import LuaLock
 except ImportError:
-    from redis.lock import Lock
+    # Change name to avoid NameError raised when use of LuaLock at line 147
+    from redis.lock import Lock as LuaLock
     
 from .processes import Process, ProcessPool
 from .utils import MovingETA, normalize_command
diff --git a/mrq/worker.py b/mrq/worker.py
index 774c9be7..9a97c20f 100644
--- a/mrq/worker.py
+++ b/mrq/worker.py
@@ -19,7 +19,8 @@
 try:
     from redis.lock import LuaLock
 except ImportError:
-    from redis.lock import Lock
+    # Change name to avoid NameError raised when use of LuaLock at line 151
+    from redis.lock import Lock as LuaLock
     
 from collections import defaultdict
 from mrq.utils import load_class_by_path