diff --git a/lib/Bastion/Curator.py b/lib/Bastion/Curator.py
index b3c26e3..fa79262 100644
--- a/lib/Bastion/Curator.py
+++ b/lib/Bastion/Curator.py
@@ -5,7 +5,7 @@
 """
 import datetime
 
-from Bastion.Common     import Thing, Boggle, canStruct
+from Bastion.Common     import Thing, Boggle, hasCanonicalForm
 from Bastion.Model      import ARK, isAsset
 from Bastion.Chronology import Quantim
 from Bastion.Humane     import humanize
@@ -141,7 +141,7 @@ def drift(self):
 #-- {quantim} is the 8 character encoding of timestamp using the Quantim method
 #-- F if the blob is an anchor (full backup) and D if the blob is a differential.
 #-- {anchor} - is a 3 character random string that cannot conflict with any other anchors currently in the archive.
-class Manifest(canStruct):
+class Manifest(hasCanonicalForm):
 	"""
 	I represent the chronicled archive of some dataset.
 	I hold a series of "snaps".
diff --git a/lib/Bastion/Site.py b/lib/Bastion/Site.py
index 510d2a5..5824c21 100644
--- a/lib/Bastion/Site.py
+++ b/lib/Bastion/Site.py
@@ -6,7 +6,7 @@
 import random
 import datetime
 
-from Bastion.Common import entity, Thing, canStruct, DAYS, RDN, asPath, asLogLevel, canConStruct
+from Bastion.Common import entity, Thing, hasCanonicalForm, fromCanonicalForm, DAYS, RDN, asPath, asLogLevel
 from Bastion.Condo import CxNode
 from Bastion.Model import ARK, isAsset, isZone, isSite
 #from .Curator import Asset
@@ -24,7 +24,7 @@
 
 
 
-class Site(isSite, canStruct):
+class Site(isSite, hasCanonicalForm):
 	SITES = { } 
 
 	@staticmethod
@@ -152,7 +152,7 @@ def asset(self, ark):
 #			return None
 
 
-class RetentionPolicy(canStruct, canConStruct):
+class RetentionPolicy(hasCanonicalForm, fromCanonicalForm):
 	"""
 	How long to store an object, how many copies, and where the copies are deposited.
 	"""
@@ -205,7 +205,7 @@ def fromJDN(cls, jdn):
 
 
 
-class Asset(isAsset, canStruct):
+class Asset(isAsset, hasCanonicalForm):
 	def __init__(self, zone, *args, **kwargs):
 		"""
 		Asset(zone:Zone, name:str)