Bugfix: Missed _sw_message to _sw_msg rename