diff --git a/classes/catkin.bbclass b/classes/catkin.bbclass
index d0bb606..397784f 100644
--- a/classes/catkin.bbclass
+++ b/classes/catkin.bbclass
@@ -1,10 +1,11 @@
 #
 # Copyright (c) 2013 Stefan Herbrechtsmeier, Bielefeld University
-# 
+# Copyright (c) 2019 LG Electronics, Inc.
+#
 
 ROS_USE_PYTHON3 ??= "no"
 
-inherit cmake ${@'distutils3-base' if bb.utils.to_boolean(d.getVar('ROS_USE_PYTHON3', True)) else 'distutils-base'} ros faulty-solibs
+inherit cmake ${@'distutils3-base' if bb.utils.to_boolean(d.getVar('ROS_USE_PYTHON3', True)) else 'distutils-base'} catkin_ros_prefix faulty-solibs
 
 # Prepend build dependency on "catkin-runtime" and "catkin-native"
 # if the package is not "catkin" or "catkin-runtime"
diff --git a/classes/ros.bbclass b/classes/catkin_ros_prefix.bbclass
similarity index 98%
rename from classes/ros.bbclass
rename to classes/catkin_ros_prefix.bbclass
index e715c64..8cc75dc 100644
--- a/classes/ros.bbclass
+++ b/classes/catkin_ros_prefix.bbclass
@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2013 Stefan Herbrechtsmeier, Bielefeld University
-# 
+# Copyright (c) 2019 LG Electronics, Inc.
+#
 
 ROS_BPN = "${@d.getVar('BPN', True).replace('-', '_')}"