diff --git a/sound_play/include/sound_play/sound_play.h b/sound_play/include/sound_play/sound_play.h
index d5fe461..c93dc2b 100644
--- a/sound_play/include/sound_play/sound_play.h
+++ b/sound_play/include/sound_play/sound_play.h
@@ -40,7 +40,7 @@
 #include <string>
 #include <ros/ros.h>
 #include <ros/node_handle.h>
-#include <sound_play/SoundRequest.h>
+#include <sound_play_msgs/SoundRequest.h>
 #include <boost/thread.hpp>
 
 namespace sound_play
diff --git a/sound_play/scripts/soundclient_example.py b/sound_play/scripts/soundclient_example.py
index 8f5a09b..7a037ad 100755
--- a/sound_play/scripts/soundclient_example.py
+++ b/sound_play/scripts/soundclient_example.py
@@ -12,7 +12,7 @@
 
 from sound_play.libsoundplay import SoundClient
 
-from sound_play.msg import SoundRequest
+from sound_play_msgs.msg import SoundRequest
 
 
 def play_explicit(node):
diff --git a/sound_play/scripts/soundplay_node.py b/sound_play/scripts/soundplay_node.py
index e388610..c518ff5 100755
--- a/sound_play/scripts/soundplay_node.py
+++ b/sound_play/scripts/soundplay_node.py
@@ -51,8 +51,8 @@
 from diagnostic_msgs.msg import DiagnosticArray
 from diagnostic_msgs.msg import DiagnosticStatus
 from diagnostic_msgs.msg import KeyValue
-from sound_play.action import SoundRequest as SoundRequestAction
-from sound_play.msg import SoundRequest
+from sound_play_msgs.action import SoundRequest as SoundRequestAction
+from sound_play_msgs.msg import SoundRequest
 
 
 try:
diff --git a/sound_play/scripts/test.py b/sound_play/scripts/test.py
index 4c50a80..7414504 100755
--- a/sound_play/scripts/test.py
+++ b/sound_play/scripts/test.py
@@ -41,7 +41,7 @@
 
 from sound_play.libsoundplay import SoundClient
 
-from sound_play.msg import SoundRequest
+from sound_play_msgs.msg import SoundRequest
 
 
 if __name__ == '__main__':
diff --git a/sound_play/scripts/test_actionlib_client.py b/sound_play/scripts/test_actionlib_client.py
index 0609eba..4d9a0b0 100755
--- a/sound_play/scripts/test_actionlib_client.py
+++ b/sound_play/scripts/test_actionlib_client.py
@@ -6,8 +6,8 @@
 import rclpy
 import rclpy.action
 
-from sound_play.action import SoundRequest as SoundRequestAction
-from sound_play.msg import SoundRequest
+from sound_play_msgs.action import SoundRequest as SoundRequestAction
+from sound_play_msgs.msg import SoundRequest
 
 
 def sound_play_client(node, volume=1.0):
diff --git a/sound_play/sound_play/libsoundplay.py b/sound_play/sound_play/libsoundplay.py
index 3dfaf58..fe082b0 100644
--- a/sound_play/sound_play/libsoundplay.py
+++ b/sound_play/sound_play/libsoundplay.py
@@ -39,8 +39,8 @@
 import rclpy.action
 
 from action_msgs.msg import GoalStatusArray
-from sound_play.action import SoundRequest as SoundRequestAction
-from sound_play.msg import SoundRequest
+from sound_play_msgs.action import SoundRequest as SoundRequestAction
+from sound_play_msgs.msg import SoundRequest
 
 
 # \brief Class that publishes messages to the sound_play node.