Indeed. At first when you typed it, I wasn't fully comfortable since the sword is a huge part of her character and her history, but then I thought about how it would give her something to work towards as well as a reason to progress in both character and IC skill. 

So Shouta Takan just became her Hawkeye Mihawk lol