3 files changed, 8 insertions, 6 deletions
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloii.gram b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
index 652d38f..712c491 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloii.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
@@ -13,9 +13,9 @@ pragma initial-rule [base-treasures]
 	[money]
 	nothing
 
-[money] [amount] [money-type]
+[money] [diablo-amount] [money-type]
 
-[amount] 1
+[diablo-amount] 1
 	5
 	10
 	20
@@ -25,6 +25,8 @@ pragma initial-rule [base-treasures]
 	500
 	1000
 
+pragma export-rule [diablo-amount]
+
 [money-type] [metal-type] coin(s)
 
 [metal-type] copper
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
index 4e1d085..a1bb40d 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
@@ -135,7 +135,7 @@ pragma prefix-with [swords] [sword-kind]
 	battle
 	great
 
-[bows] arrow ( [amount] count)
+[bows] arrow ( [diablo-amount] count)
 	bow
 	[bow-size] bow
 	[bow-type] bow
@@ -149,7 +149,7 @@ pragma prefix-with [swords] [sword-kind]
 	battle
 	war
 
-[crossbows] bolt ( [amount] count)
+[crossbows] bolt ( [diablo-amount] count)
 	crossbow
 	[crossbow-type] crossbow
 
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
index 40b36b0..3ea3034 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
@@ -9,7 +9,7 @@
 	[personal-stat]
 	[to-hit]
 	[extra-damage]
-	[to-hit+damage]
+	[to-hit-damage]
 	[item-charges]
 
 pragma export-rule [prefix]
@@ -156,7 +156,7 @@ pragma export-rule [prefix]
 	ruthless
 	merciless
 
-[to-hit+damage] sharp
+[to-hit-damage] sharp
 	fine
 	warrior’s
 	soldier’s