Rename everything to restore standard ISAM terminology