BUR #14796 has been approved by @nonamethanks.
rename watashi -> watashi_(yojouhan)
rename mochiguman -> mochiguman_(yojouhan)
rename jougasaki -> jougasaki_(yojouhan)
Last two aren't really important, just for consistency. The first is literally a personal pronoun and should be qualified.