Changed all references to 'id' in Terminator to 'name'.