diff --git a/src/nitro/avatar/animation/AnimationLayerData.ts b/src/nitro/avatar/animation/AvatarAnimationLayerData.ts
similarity index 97%
rename from src/nitro/avatar/animation/AnimationLayerData.ts
rename to src/nitro/avatar/animation/AvatarAnimationLayerData.ts
index 5a28dcd3..8e2d9000 100644
--- a/src/nitro/avatar/animation/AnimationLayerData.ts
+++ b/src/nitro/avatar/animation/AvatarAnimationLayerData.ts
@@ -4,7 +4,7 @@ import { IActionDefinition } from '../actions/IActionDefinition';
 import { IActiveActionData } from '../actions/IActiveActionData';
 import { IAnimationLayerData } from './IAnimationLayerData';
 
-export class AnimationLayerData implements IAnimationLayerData
+export class AvatarAnimationLayerData implements IAnimationLayerData
 {
     public static BODYPART: string = 'bodypart';
     public static FX: string = 'fx';
diff --git a/src/nitro/avatar/structure/AnimationData.ts b/src/nitro/avatar/structure/AvatarAnimationData.ts
similarity index 95%
rename from src/nitro/avatar/structure/AnimationData.ts
rename to src/nitro/avatar/structure/AvatarAnimationData.ts
index 7e714b34..bbfce8f8 100644
--- a/src/nitro/avatar/structure/AnimationData.ts
+++ b/src/nitro/avatar/structure/AvatarAnimationData.ts
@@ -2,7 +2,7 @@ import { IActionDefinition } from '../actions/IActionDefinition';
 import { AnimationAction } from './animation/AnimationAction';
 import { IFigureSetData } from './IFigureSetData';
 
-export class AnimationData implements IFigureSetData
+export class AvatarAnimationData implements IFigureSetData
 {
     private _actions: Map<string, AnimationAction>;
 
@@ -55,4 +55,4 @@ export class AnimationData implements IFigureSetData
 
         return animationAction._Str_2185;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/avatar/structure/animation/AnimationFrame.ts b/src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts
similarity index 91%
rename from src/nitro/avatar/structure/animation/AnimationFrame.ts
rename to src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts
index 74899f9c..f86273fe 100644
--- a/src/nitro/avatar/structure/animation/AnimationFrame.ts
+++ b/src/nitro/avatar/structure/animation/AvatarAnimationFrame.ts
@@ -1,4 +1,4 @@
-export class AnimationFrame
+export class AvatarAnimationFrame
 {
     private _number: number;
     private _assetPartDefinition: string;
@@ -18,4 +18,4 @@ export class AnimationFrame
     {
         return this._assetPartDefinition;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/room/utils/FurnitureData.ts b/src/nitro/room/utils/RoomFurnitureData.ts
similarity index 98%
rename from src/nitro/room/utils/FurnitureData.ts
rename to src/nitro/room/utils/RoomFurnitureData.ts
index e7e9d121..3e52b160 100644
--- a/src/nitro/room/utils/FurnitureData.ts
+++ b/src/nitro/room/utils/RoomFurnitureData.ts
@@ -2,7 +2,7 @@
 import { Vector3d } from '../../../room/utils/Vector3d';
 import { IObjectData } from '../object/data/IObjectData';
 
-export class FurnitureData
+export class RoomFurnitureData
 {
     private _id: number;
     private _typeId: number;
@@ -117,4 +117,4 @@ export class FurnitureData
     {
         return this._sizeZ;
     }
-}
\ No newline at end of file
+}