2 files changed, 10 insertions, 10 deletions
diff --git a/generic/arch.h b/generic/arch.h
index 85c98814..924115a7 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -281,30 +281,30 @@ struct Arch : BaseCtx
         return cell_types;
     }
 
-    std::vector<PartitionId> getPartitions() const {
+    std::vector<BelBucketId> getBelBuckets() const {
         return getCellTypes();
     }
 
-    IdString getPartitionName(PartitionId partition) const {
-        return partition;
+    IdString getBelBucketName(BelBucketId bucket) const {
+        return bucket;
     }
 
-    PartitionId getPartitionByName(IdString partition) const {
-        return partition;
+    BelBucketId getBelBucketByName(IdString bucket) const {
+        return bucket;
     }
 
-    PartitionId getPartitionForBel(BelId bel) const {
+    BelBucketId getBelBucketForBel(BelId bel) const {
         return getBelType(bel);
     }
 
-    PartitionId getPartitionForCellType(IdString cell_type) const {
+    BelBucketId getBelBucketForCellType(IdString cell_type) const {
         return cell_type;
     }
 
-    std::vector<BelId> getBelsForPartition(PartitionId partition) const {
+    std::vector<BelId> getBelsInBucket(BelBucketId bucket) const {
         std::vector<BelId> bels;
         for(BelId bel : getBels()) {
-            if(partition == getPartitionForBel(bel)) {
+            if(bucket == getBelBucketForBel(bel)) {
                 bels.push_back(bel);
             }
         }
diff --git a/generic/archdefs.h b/generic/archdefs.h
index cb78249a..7623bf40 100644
--- a/generic/archdefs.h
+++ b/generic/archdefs.h
@@ -51,7 +51,7 @@ typedef IdString WireId;
 typedef IdString PipId;
 typedef IdString GroupId;
 typedef IdString DecalId;
-typedef IdString PartitionId;
+typedef IdString BelBucketId;
 
 struct ArchNetInfo
 {