Rename some saw-core type variables to use more common naming scheme
Rename some saw-core type variables to use more common naming scheme

GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script