7 files changed, 14 insertions, 11 deletions
diff --git a/src/asset-manager.cpp b/src/asset-manager.cpp
index 4350e87..753da24 100644
--- a/src/asset-manager.cpp
+++ b/src/asset-manager.cpp
@@ -1,7 +1,7 @@
 
 #include "asset-manager.hpp"
 
-const uint32_t maxAssetItemsPerBucket = 256;
+const PkeHandleItemIndex_T maxAssetItemsPerBucket = 256;
 
 struct AssetBucket {
 	Asset assets[maxAssetItemsPerBucket];
diff --git a/src/camera.cpp b/src/camera.cpp
index 07c00b8..bfb7bf5 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -13,7 +13,7 @@ PkeCamera NullCamera {
 };
 PkeCamera *ActiveCamera = &NullCamera;
 
-const long MAX_CAMERAS_PER_BUCKET = 32;
+const PkeHandleItemIndex_T MAX_CAMERAS_PER_BUCKET = 32;
 struct CameraBucket {
 	PkeCamera cameras[MAX_CAMERAS_PER_BUCKET];
 };
diff --git a/src/ecs.cpp b/src/ecs.cpp
index fdc2473..1bd974b 100644
--- a/src/ecs.cpp
+++ b/src/ecs.cpp
@@ -12,7 +12,7 @@
 #include <BulletCollision/CollisionShapes/btConvexHullShape.h>
 #include <glm/gtc/type_ptr.hpp>
 
-const uint32_t maxBucketItemCount = 256;
+const PkeHandleItemIndex_T maxBucketItemCount = 256;
 
 struct EntityBucket {
 	Entity entities[maxBucketItemCount];
diff --git a/src/memory-type-defs.hpp b/src/memory-type-defs.hpp
index bc45160..d9d6f5e 100644
--- a/src/memory-type-defs.hpp
+++ b/src/memory-type-defs.hpp
@@ -3,11 +3,14 @@
 
 #include <cstdint>
 
+using PkeHandleBucketIndex_T = uint32_t;
+using PkeHandleItemIndex_T = uint32_t;
+
 struct PkeHandle {
 	union {
 		struct {
-			uint32_t bucketIndex;
-			uint32_t itemIndex;
+			PkeHandleBucketIndex_T bucketIndex;
+			PkeHandleItemIndex_T itemIndex;
 		};
 		uint64_t hash = 0xFFFFFFFFFFFFFFFF;
 	};
diff --git a/src/memory.cpp b/src/memory.cpp
index 7ad282c..8acfb4d 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -344,7 +344,7 @@ void Pke_MemoryFlush() {
 	}
 }
 
-PkeHandle Buckets_NewHandle(std::size_t bucketBytes, std::size_t alignment, uint32_t bucketItemCount, uint32_t &bucketIncrementer, uint32_t &bucketCounter, uint32_t &itemCounter, void*& buckets, bool &moved) {
+PkeHandle Buckets_NewHandle(std::size_t bucketBytes, std::size_t alignment, PkeHandleItemIndex_T bucketItemCount, PkeHandleBucketIndex_T &bucketIncrementer, PkeHandleBucketIndex_T &bucketCounter, PkeHandleItemIndex_T &itemCounter, void*& buckets, bool &moved) {
 	moved = false;
 	PkeHandle returnValue {
 		.bucketIndex = bucketCounter,
diff --git a/src/memory.hpp b/src/memory.hpp
index 41e215f..4a44ba7 100644
--- a/src/memory.hpp
+++ b/src/memory.hpp
@@ -19,7 +19,7 @@ extern const std::size_t MAXIMUM_ALIGNMENT;
 
 template<typename T, typename CT>
 struct BucketContainer {
-	uint32_t incrementer = 2;
+	PkeHandleBucketIndex_T incrementer = 2;
 	CT pkeHandle;
 	T *buckets = nullptr;
 };
@@ -96,8 +96,8 @@ void Buckets_Init(BucketContainer<T, CT> &bktContainer) {
 	bktContainer.buckets = Pke_New<T>(bktContainer.incrementer);
 }
 
-PkeHandle Buckets_NewHandle(std::size_t bucketBytes, std::size_t alignment, uint32_t bucketItemCount, uint32_t &bucketIncrementer, uint32_t &bucketCounter, uint32_t &itemCounter, void*& buckets, bool &moved);
-template <typename T> inline PkeHandle Buckets_NewHandle(uint32_t bucketItemCount, uint32_t &bucketIncrementer, uint32_t &bucketCounter, uint32_t &itemCounter, T*& buckets, bool &moved) {
+PkeHandle Buckets_NewHandle(std::size_t bucketBytes, std::size_t alignment, PkeHandleItemIndex_T bucketItemCount, PkeHandleBucketIndex_T &bucketIncrementer, PkeHandleBucketIndex_T &bucketCounter, PkeHandleItemIndex_T &itemCounter, void*& buckets, bool &moved);
+template <typename T> inline PkeHandle Buckets_NewHandle(PkeHandleItemIndex_T bucketItemCount, PkeHandleBucketIndex_T &bucketIncrementer, PkeHandleBucketIndex_T &bucketCounter, PkeHandleItemIndex_T &itemCounter, T*& buckets, bool &moved) {
 	void *ptr = reinterpret_cast<void *>(buckets);
 	PkeHandle handle = Buckets_NewHandle(sizeof(T), alignof(T), bucketItemCount, bucketIncrementer, bucketCounter, itemCounter, ptr, moved);
 	buckets = reinterpret_cast<T *>(ptr);
@@ -105,7 +105,7 @@ template <typename T> inline PkeHandle Buckets_NewHandle(uint32_t bucketItemCoun
 }
 
 template <typename T, typename CT = PkeHandle>
-inline CT Buckets_NewHandle(uint32_t maxBucketItemCount, BucketContainer<T, CT> &bktContainer, bool &moved) {
+inline CT Buckets_NewHandle(PkeHandleItemIndex_T maxBucketItemCount, BucketContainer<T, CT> &bktContainer, bool &moved) {
 	CT returnValue{};
 	returnValue.hash = Buckets_NewHandle<T>(maxBucketItemCount, bktContainer.incrementer, bktContainer.pkeHandle.bucketIndex, bktContainer.pkeHandle.itemIndex, bktContainer.buckets, moved).hash;
 	return returnValue;
diff --git a/src/thread_pool.cpp b/src/thread_pool.cpp
index 48338e5..3af2273 100644
--- a/src/thread_pool.cpp
+++ b/src/thread_pool.cpp
@@ -16,7 +16,7 @@ struct ThreadPool {
 	MemBucket *bkt = nullptr;
 };
 
-const uint32_t MAX_THREADS_PER_BUCKET = 8;
+const PkeHandleItemIndex_T MAX_THREADS_PER_BUCKET = 8;
 struct ThreadBucket {
 	ThreadPool threadPools[MAX_THREADS_PER_BUCKET];
 };