Renamed jtox filenaming functions
Merge branch 'ollieh-master'