fix type conflicts

ArabicCulture.kif

@@ -328,7 +328,7 @@ hosted in celebration of having a new born baby.")
   (exists (?AGENT)
     (and
       (agent ?A ?AGENT)
-      (attribute ?A Muslim))))
+      (property ?A Muslim))))
 
 (=>
   (instance ?A Aqiqah)

Economy.kif

@@ -1346,22 +1346,6 @@ compared with prices from the prior period.")
 (domain inflationRateOfConsumerPrices 1 GeopoliticalArea)
 (domain inflationRateOfConsumerPrices 2 RealNumber)
 
-(documentation inflationRateOfConsumerPrices EnglishLanguage 
-"(&%inflationRateOfConsumerPrices ?AREA ?FRACTION) means that in the 
-&%GeopoliticalArea ?AREA, the annual change in consumer prices was 
-?FRACTION, compared with prices from the previous year.")
-
-(=>
-  (inflationRateOfConsumerPrices ?AREA ?FRACTION)
-  (lessThanOrEqualTo ?FRACTION 1.0))
-
-(<=>
-  (inflationRateOfConsumerPricesInPeriod ?AREA ?FRACTION ?PERIOD)
-  (exists (?TIME)
-    (and
-      (instance ?TIME ?PERIOD)
-      (holdsDuring ?TIME (inflationRateOfConsumerPrices ?AREA ?FRACTION)))))
-
 ;;
 ;;-----------------------------------------------------------------------------
 ;;
@@ -2666,7 +2650,7 @@ indicated by ?PERIOD.")
     (and
       (instance ?TIME ?PERIOD)
       (instance ?EXPORT Exporting)
-      (overlapsTemporally ?TIME ?EXPORT)
+      (overlapsTemporally ?TIME (WhenFn ?EXPORT))
       (origin ?EXPORT ?AGENT2)
       (destination ?EXPORT ?AGENT1))))
 

FinancialOntology.kif

@@ -1672,26 +1672,12 @@ Price Index and the Producer Price Index.")
       (instance ?Inflation Inflation)
       (benchmark ?Inflation ?Index))))
 
-(instance inflationRate BinaryPredicate)
-(domain inflationRate 1 Inflation)
-(domain inflationRate 2 RealNumber)
-(documentation inflationRate EnglishLanguage "The percentage increase in the price of goods and services, 
-usually annually.")
-
 (instance inflationRateInCountry BinaryPredicate)
 (domain inflationRateInCountry 1 Nation)
 (domain inflationRateInCountry 2 RealNumber)
+(domain inflationRateInCountry 3 TimeInterval)
 (documentation inflationRateInCountry EnglishLanguage "The annually percentage increase 
-in the price of goods and services for the given &%Nation.")
-
-(=>
-  (inflationRateInCountry ?N ?R)
-  (exists (?I)
-    (and
-      (instance ?I Inflation)
-      (duration (WhenFn ?I) YearDuration)
-      (experiencer ?I ?N)
-      (inflationRate ?I ?R))))
+in the price of goods and services for the given &%Nation and &%TimeInterval.")
 
 (subclass ConsumerPriceIndex InflationIndex)
 (documentation ConsumerPriceIndex EnglishLanguage "An inflationary indicator that measures 

Food.kif

@@ -1304,12 +1304,8 @@ giving a 180ml of capuucino.The milk foam on the top is 20mm in thickness. [Wiki
 (documentation Americano EnglishLanguage "An &%Americano is  is a type of coffee drink 
 prepared by diluting an espresso with hot water (typically 1:5). [Wikipedia] ")
 (termFormat EnglishLanguage Americano "americano")
-
-(=>
-  (instance ?A Americano)
-  (and
-    (material Espresso ?A)
-    (material DrinkingWater ?A)))
+(ingredient Espresso Americano)
+(ingredient DrinkingWater Americano)
 
 (=>
   (instance ?A Americano)
@@ -2083,11 +2079,8 @@ is a traditional Provençal sauce made of garlic, olive oil, and
 (typically) egg. There are many variations, such as the addition 
 of mustard or, in Catalonia, pears. It is usually served at room 
 temperature.")
-(=>
-  (instance ?A Aioli)
-  (and
-    (material Garlic ?A)
-    (material OliveOil ?A)))
+(ingredient Garlic Aioli)
+(ingredient OliveOil Aioli)
 
 (subclass AlmondNut EdibleNut)
 (documentation AlmondNut EnglishLanguage "Almond (Prunus dulcis, syn. 

Medicine.kif

@@ -4031,7 +4031,7 @@ risk of suicide. [from Wikipedia]")
         (subclass ?C Investigating)
         (subclass ?C Cleaning))
       (=>
-        (member ?CI ?C)
+        (instance ?CI ?C)
         (and
           (agent ?CI ?H)
           (not

Mid-level-ontology.kif

@@ -963,7 +963,7 @@ For example, (&%dateEstablished &%UnitedNations
 
 (instance dateUsed TernaryPredicate)
 (domain dateUsed 1 Object)
-(domain dateUsed 2 TimePoint)
+(domain dateUsed 2 TimeInterval)
 (domain dateUsed 3 AutonomousAgent)
 (documentation dateUsed EnglishLanguage "The date an &%Object is used by an &%AutonomousAgent.")
 (termFormat EnglishLanguage dateUsed "date used")
@@ -18280,21 +18280,23 @@ with these entities but merely the the principal concern of the given department
 (format EnglishLanguage DepartmentOfFn "the &%department of %2 in %1")
 
 (=>
-  (equal ?DEP (DepartmentOfFn ?COMP ?PHYS))
+  (equal ?DEP
+    (DepartmentOfFn ?COMP ?PHYS))
   (exists (?P ?I)
     (and
       (agent ?P ?DEP)
       (instance ?I ?PHYS)
-      (inScopeOfInterest ?P ?I))))
+      (inScopeOfInterest ?DEP ?I))))
 
 (=>
   (and
-    (equal ?DEP (DepartmentOfFn ?COMP ?PHYS))
+    (equal ?DEP
+      (DepartmentOfFn ?COMP ?PHYS))
     (subOrganization ?DEP2 ?COMP)
     (not
       (equal ?DEP ?DEP2))
     (instance ?I ?PHYS)
-    (inScopeOfInterest ?P ?I)
+    (inScopeOfInterest ?DEP ?I)
     (equal ?P1
       (ProbabilityFn
         (agent ?P ?DEP)))
@@ -24268,10 +24270,8 @@ the &%Artifact ?THING has a component or attachment of &%Device ?TYPE.
 See also &%equipmentTypeCount.")
 (instance equipmentType BinaryPredicate)
 (domain equipmentType 1 Artifact)
-(domain equipmentType 2 Device)
-;;
-;; Jennie 10th August 2022
-;; revised the second arguement of equipmentType to ?DEVICE, an instance of the class ?T
+(domainSubclass equipmentType 2 Device)
+
 (=>
   (equipmentType ?O ?T)
   (exists (?D)
@@ -24286,17 +24286,15 @@ See also &%equipmentTypeCount.")
   (exists (?DEVICE)
     (and
       (instance ?DEVICE ?T)
-      (equipmentType ?O ?DEVICE))))
-;;
-;; Jennie 10th August 2022
-;; added ?D as a class of Device for the second arguement of equipmentCount
+      (equipmentType ?O ?T))))
+
 (=>
   (equipmentType ?O ?T)
   (exists (?C ?D)
     (and
-      (instance ?T ?D)
+      (instance ?D ?T)
       (greaterThanOrEqualTo ?C 1)
-      (equipmentCount ?O ?D ?C))))
+      (equipmentCount ?O ?T ?C))))
 
 (documentation grammaticalRelation EnglishLanguage "(grammaticalRelation ?PHRASE ?SENTENCE)
 means that the &%Phrase ?PHRASE has a grammatical relation to the Sentence

Music.kif

@@ -1045,7 +1045,7 @@ that returns an &%instance of &%Contest that occured during &%TimePoint ?TI")
 (termFormat EnglishLanguage ContestFn "contest function")
 
 (domainSubclass ContestFn 1 Contest)
-(domain ContestFn 2 TimePoint)
+(domain ContestFn 2 TimeInterval)
 (range ContestFn Contest)
 
 (=>

QoSontology.kif

@@ -2086,9 +2086,9 @@ measure against unauthorized access to data. It is normally managed by the
 operating system or DBMS.")
 
 (=>
-	(hasAccount ?User ?Account)
-	(exists (?Password)
-		(password ?Password ?User)))
+  (hasAccount ?User ?Account)
+  (exists (?Password)
+    (password ?Password ?Account)))
 
 ;; password