diff --git a/RhythmBullet/ContentResolvers/ResolutionContentResolver.cs b/RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
index ff9e74d..c3f0b13 100644
--- a/RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
+++ b/RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
@@ -1,10 +1,10 @@
-using RecrownedAthenaeum.ContentSystem;
-using RecrownedAthenaeum.SpecialTypes;
+using RecrownedAthenaeum.Assets;
+using RecrownedAthenaeum.Types;
 using System.Diagnostics;
 
 namespace RhythmBullet.ContentResolvers
 {
-    internal class ResolutionContentResolver : IContentPathResolver
+    internal class ResolutionContentResolver : IAssetPathResolver
     {
         int width, height;
         bool updated;
diff --git a/RhythmBullet/RhythmBulletGame.cs b/RhythmBullet/RhythmBulletGame.cs
index 40c3d2c..1960de1 100644
--- a/RhythmBullet/RhythmBulletGame.cs
+++ b/RhythmBullet/RhythmBulletGame.cs
@@ -2,11 +2,11 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using RecrownedAthenaeum.Render;
-using RecrownedAthenaeum.ContentSystem;
+using RecrownedAthenaeum.Assets;
 using RecrownedAthenaeum.Input;
 using RecrownedAthenaeum.Persistence;
 using RecrownedAthenaeum.UI.ScreenSystem;
-using RecrownedAthenaeum.SpecialTypes;
+using RecrownedAthenaeum.Types;
 using RecrownedAthenaeum.UI.SkinSystem;
 using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 using RhythmBullet.Audio;
@@ -30,7 +30,7 @@ namespace RhythmBullet
 
         GraphicsDeviceManager graphics;
         ConsistentSpriteBatch spriteBatch;
-        public readonly ContentManagerController assets;
+        public readonly AssetManager assets;
         public PreferencesManager preferencesManager;
         private ScreenManager screenManager;
         public Camera2D Camera { get; private set; }
@@ -46,7 +46,7 @@ namespace RhythmBullet
         {
             graphics = new GraphicsDeviceManager(this);
             Content.RootDirectory = "Content";
-            assets = new ContentManagerController(Content);
+            assets = new AssetManager();
             //Add the content resolvers.
             assets.AddContentPathResolver(typeof(Texture2D), resolutionContentResolver);
             fontContentResolver = new FontContentResolver(resolutionContentResolver);