Yes, Aerith's Knight was Japan was mafia, and yes, I think it's obvious that he was Aerith's Knight.

So what we're going to do is we're going to randomly choose someone to swap with him. Any one. It could be a townie, the cult leader, a fellow mafia - it could even be himself and he could get his old role back. I don't know.

So yeah, don't say "AERITH'S KNIGHT SPOTTED! LYNCH SCUM LYNCH!" 'cause in all probability you'd be wrong.

Sorry to the person who loses their old role...although you do get to be mafia, so y'know.