cleanup so we don't get duplicate asset names
Type -> AssetType in a few places to avoid confusion with CF type