Rename packages to conform to ROS conventions
Merge naming changes