[ros-general] Trademark update and other stuff