Rename back to original names awaiting the jtoxcore pull request