Re-ordered and renamed variables

Re-ordered and renamed variables; easier to check vs keyfiles, sync
with OSemu