diff --git a/src/loaders/ImageLoader/ImageLoader.c b/src/loaders/ImageLoader/ImageLoader.c
index 5e35bc0..58f02e6 100644
--- a/src/loaders/ImageLoader/ImageLoader.c
+++ b/src/loaders/ImageLoader/ImageLoader.c
@@ -14,7 +14,7 @@ ImageAsset
 ev_imageloader_loadasset(
     AssetHandle handle)
 {
-  const Asset *asset = ev_asset_getfromhandle(handle);
+  const AssetStruct *asset = ev_asset_getfromhandle(handle);
 
   uint32_t jsonLength = ((U32*)asset->data)[0];
   uint32_t blobLength = ((U32*)asset->data)[1];
diff --git a/src/loaders/JSONLoader/JSONLoader.c b/src/loaders/JSONLoader/JSONLoader.c
index 754d840..d81f1ce 100644
--- a/src/loaders/JSONLoader/JSONLoader.c
+++ b/src/loaders/JSONLoader/JSONLoader.c
@@ -10,7 +10,7 @@ JSONAsset
 ev_jsonloader_loadasset(
     AssetHandle handle)
 {
-  const Asset *asset = ev_asset_getfromhandle(handle);
+  const AssetStruct *asset = ev_asset_getfromhandle(handle);
   JSONAsset inter = (JSONAsset) {
     .json_data = evjs_init(),
   };
diff --git a/src/loaders/LoaderCommon.h b/src/loaders/LoaderCommon.h
index c177e99..9feced7 100644
--- a/src/loaders/LoaderCommon.h
+++ b/src/loaders/LoaderCommon.h
@@ -8,14 +8,14 @@ typedef struct {
 
   U32 ref_count;
   U32 ticks_left;
-} Asset;
+} AssetStruct;
 
 static struct {
   GenericHandle assetType;
 } LoaderData;
 
 
-const Asset *
+const AssetStruct *
 ev_asset_getfromhandle(
     AssetHandle handle);
 
diff --git a/src/loaders/MeshLoader/MeshLoader.c b/src/loaders/MeshLoader/MeshLoader.c
index 569e442..a6d8e48 100644
--- a/src/loaders/MeshLoader/MeshLoader.c
+++ b/src/loaders/MeshLoader/MeshLoader.c
@@ -17,7 +17,7 @@ MeshAsset
 ev_meshloader_loadasset(
     AssetHandle handle)
 {
-  const Asset *asset = ev_asset_getfromhandle(handle);
+  const AssetStruct *asset = ev_asset_getfromhandle(handle);
 
   uint32_t jsonLength = ((U32*)asset->data)[0];
   uint32_t blobLength = ((U32*)asset->data)[1];
diff --git a/src/loaders/ShaderLoader/ShaderLoader.c b/src/loaders/ShaderLoader/ShaderLoader.c
index cf8cbee..9b6009f 100644
--- a/src/loaders/ShaderLoader/ShaderLoader.c
+++ b/src/loaders/ShaderLoader/ShaderLoader.c
@@ -55,7 +55,7 @@ ev_shaderloader_loadasset(
     CONST_STR entrypoint,
     CompiledShaderType type)
 {
-  const Asset *asset = ev_asset_getfromhandle(handle);
+  const AssetStruct *asset = ev_asset_getfromhandle(handle);
   ShaderCompilationFn compilation_fn = 
     (type == EV_SHADER_BIN)
       ?(ShaderCompilationFn)shaderc_compile_into_spv:
diff --git a/src/loaders/TextLoader/TextLoader.c b/src/loaders/TextLoader/TextLoader.c
index 42ba966..a400639 100644
--- a/src/loaders/TextLoader/TextLoader.c
+++ b/src/loaders/TextLoader/TextLoader.c
@@ -9,7 +9,7 @@ TextAsset
 ev_textloader_loadasset(
     AssetHandle handle)
 {
-  const Asset *asset = ev_asset_getfromhandle(handle);
+  const AssetStruct *asset = ev_asset_getfromhandle(handle);
   TextAsset inter = (TextAsset) {
     .text = evstring_new(asset->data),
   };
diff --git a/src/mod.c b/src/mod.c
index 5410dec..03bbf00 100644
--- a/src/mod.c
+++ b/src/mod.c
@@ -38,7 +38,7 @@ void
 onRemoveAssetComponent(
     ECSQuery query)
 {
-  Asset *assets = ECS->getQueryColumn(query, sizeof(Asset), 1);
+  AssetStruct *assets = ECS->getQueryColumn(query, sizeof(AssetStruct), 1);
   for(U32 i = 0; i < ECS->getQueryMatchCount(query); i++) {
     aligned_free(assets[i].data);
   }
@@ -108,7 +108,7 @@ EV_CONSTRUCTOR
     if(AssetECS) {
       AssetManagerData.world = AssetECS->newWorld();
 
-      AssetManagerData.assetcomponent_id = AssetECS->registerComponent("Asset", sizeof(Asset), EV_ALIGNOF(Asset));
+      AssetManagerData.assetcomponent_id = AssetECS->registerComponent("Asset", sizeof(AssetStruct), EV_ALIGNOF(AssetStruct));
       AssetECS->setOnRemoveTrigger("AssetComponentOnRemove", "Asset", onRemoveAssetComponent);
 
       ev_textloader_setassettype(AssetECS->registerComponent("TextAsset", sizeof(TextAsset), EV_ALIGNOF(TextAsset)));
@@ -155,7 +155,7 @@ ev_asset_load(
 {
   assetsys_file_t file;
   AssetSysCheck("Failed to find file %s. ", (path), assetsys_file(AssetManagerData.sys, path, &file));
-  Asset a;
+  AssetStruct a;
   a.size = (I64)assetsys_file_size(AssetManagerData.sys, file);
   a.data = aligned_malloc(a.size + 1, 16);
   int loaded_size = 0;
@@ -175,7 +175,7 @@ AssetHandle
 ev_asset_clonehandle(
     AssetHandle handle)
 {
-  Asset *asset = AssetECS->getComponent(AssetManagerData.world, handle, AssetManagerData.assetcomponent_id);
+  AssetStruct *asset = AssetECS->getComponent(AssetManagerData.world, handle, AssetManagerData.assetcomponent_id);
   asset->ref_count++;
 
   return handle;
@@ -185,7 +185,7 @@ void
 ev_asset_free(
     AssetHandle handle)
 {
-  Asset *asset = AssetECS->getComponent(AssetManagerData.world, handle, AssetManagerData.assetcomponent_id);
+  AssetStruct *asset = AssetECS->getComponent(AssetManagerData.world, handle, AssetManagerData.assetcomponent_id);
   asset->ref_count--;
   if(asset->ref_count == 0) {
     AssetECS->destroyEntity(AssetManagerData.world, handle);
@@ -225,7 +225,7 @@ ev_assetmanager_stopwatching(
   filewatch_stop_watching(AssetManagerData.fwatch, path);
 }
 
-const Asset *
+const AssetStruct *
 ev_asset_getfromhandle(
     AssetHandle handle)
 {