Fixes: #2278 rename all the goto leftover to argonaut