Changed controller and joint names [ci skip]