diff --git a/Externals/OPCODE/OPC_TreeBuilders.h b/Externals/OPCODE/OPC_TreeBuilders.h
index f639ea33523..b88d703f3e3 100644
--- a/Externals/OPCODE/OPC_TreeBuilders.h
+++ b/Externals/OPCODE/OPC_TreeBuilders.h
@@ -20,7 +20,7 @@
 #ifndef __OPC_TREEBUILDERS_H__
 #define __OPC_TREEBUILDERS_H__
 
-#include "opc_aabbtree.h"
+#include "OPC_AABBTree.h"
 #include "xrCore/xrPool.h"
 
 //! Tree splitting rules
diff --git a/Externals/OPCODE/Opcode.h b/Externals/OPCODE/Opcode.h
index 946357d2c5e..124e07c58b3 100644
--- a/Externals/OPCODE/Opcode.h
+++ b/Externals/OPCODE/Opcode.h
@@ -58,7 +58,7 @@ using namespace IceCore;
 #endif
 
 #ifndef __ICEMATHS_H__
-#include <Math.h>
+#include <math.h>
 #define ICEMATHS_API OPCODE_API
 namespace IceMaths
 {
diff --git a/src/Include/xrRender/Kinematics.h b/src/Include/xrRender/Kinematics.h
index 15e61d512ef..79810b8543b 100644
--- a/src/Include/xrRender/Kinematics.h
+++ b/src/Include/xrRender/Kinematics.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "RenderVisual.h"
-#include "Layers\xrRender\KinematicsAddBoneTransform.hpp" //--#SM+#--
+#include "Layers/xrRender/KinematicsAddBoneTransform.hpp" //--#SM+#--
 
 typedef void (*UpdateCallback)(IKinematics* P);
 
diff --git a/src/Include/xrRender/KinematicsAnimated.h b/src/Include/xrRender/KinematicsAnimated.h
index fc8ebb20425..1c2356c0a5d 100644
--- a/src/Include/xrRender/KinematicsAnimated.h
+++ b/src/Include/xrRender/KinematicsAnimated.h
@@ -4,7 +4,7 @@
 
 #include "xrCore/Animation/SkeletonMotions.hpp"
 #include "animation_blend.h"
-#include "Layers/xrrender/KinematicAnimatedDefs.h"
+#include "Layers/xrRender/KinematicAnimatedDefs.h"
 #include "Layers/xrRender/KinematicsAddBoneTransform.hpp" //--#SM+#--
 
 class IKinematics;
diff --git a/src/xrAICore/Navigation/graph_edge.h b/src/xrAICore/Navigation/graph_edge.h
index ffa8f9951fd..e7161ea6b05 100644
--- a/src/xrAICore/Navigation/graph_edge.h
+++ b/src/xrAICore/Navigation/graph_edge.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <loki/emptytype.h>
+#include <loki/EmptyType.h>
 
 template <typename _edge_weight_type, typename _vertex_type>
 class CEdgeBase
diff --git a/src/xrCDB/ISpatial.cpp b/src/xrCDB/ISpatial.cpp
index 03b319fe83d..6f8284b5a83 100644
--- a/src/xrCDB/ISpatial.cpp
+++ b/src/xrCDB/ISpatial.cpp
@@ -6,7 +6,7 @@
 #include "xrEngine/xr_object.h"
 #include "xrEngine/PS_Instance.h"
 #endif
-#include "xrEngine/Device.h"
+#include "xrEngine/device.h"
 #include "xrEngine/GameFont.h"
 #include "xrEngine/PerformanceAlert.hpp"
 #include "xrCore/Threading/Lock.hpp"
diff --git a/src/xrCDB/StdAfx.h b/src/xrCDB/stdafx.h
similarity index 100%
rename from src/xrCDB/StdAfx.h
rename to src/xrCDB/stdafx.h
diff --git a/src/xrEngine/Device_destroy.cpp b/src/xrEngine/Device_destroy.cpp
index b846170ab2f..6369084da0a 100644
--- a/src/xrEngine/Device_destroy.cpp
+++ b/src/xrEngine/Device_destroy.cpp
@@ -2,7 +2,7 @@
 #include "Include/xrRender/DrawUtils.h"
 #include "Render.h"
 #include "IGame_Persistent.h"
-#include "xr_IOConsole.h"
+#include "XR_IOConsole.h"
 #include "xr_input.h"
 
 void CRenderDevice::Destroy()
diff --git a/src/xrEngine/FDemoRecord.cpp b/src/xrEngine/FDemoRecord.cpp
index 164a0090863..41738896563 100644
--- a/src/xrEngine/FDemoRecord.cpp
+++ b/src/xrEngine/FDemoRecord.cpp
@@ -3,7 +3,7 @@
 #include "x_ray.h"
 
 #include "GameFont.h"
-#include "fDemoRecord.h"
+#include "FDemoRecord.h"
 #include "XR_IOConsole.h"
 #include "xr_input.h"
 #include "xr_object.h"
diff --git a/src/xrEngine/stdafx.h b/src/xrEngine/stdafx.h
index 11bd3e05a8a..c400d046729 100644
--- a/src/xrEngine/stdafx.h
+++ b/src/xrEngine/stdafx.h
@@ -24,7 +24,7 @@
 #include "xrCore/log.h"
 #endif
 #include "device.h"
-#include "xrCore/fs.h"
+#include "xrCore/FS.h"
 
 #include "xrCDB/xrXRC.h"
 
diff --git a/src/xrEngine/xrTheora_Stream.cpp b/src/xrEngine/xrTheora_Stream.cpp
index b64cb195588..a83693dfe99 100644
--- a/src/xrEngine/xrTheora_Stream.cpp
+++ b/src/xrEngine/xrTheora_Stream.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "xrtheora_stream.h"
+#include "xrTheora_Stream.h"
 
 #ifdef _EDITOR
 //# pragma comment(lib, "x:\\oggB.lib")
diff --git a/src/xrEngine/xrTheora_Stream.h b/src/xrEngine/xrTheora_Stream.h
index bd49d9c5d70..02538604995 100644
--- a/src/xrEngine/xrTheora_Stream.h
+++ b/src/xrEngine/xrTheora_Stream.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <theora/theora.h>
-#include "xrCore/Stream_Reader.h"
+#include "xrCore/stream_reader.h"
 
 class ENGINE_API CTheoraStream
 {
diff --git a/src/xrEngine/xrTheora_Surface.cpp b/src/xrEngine/xrTheora_Surface.cpp
index a1e83b323d1..899b583c573 100644
--- a/src/xrEngine/xrTheora_Surface.cpp
+++ b/src/xrEngine/xrTheora_Surface.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "xrtheora_surface.h"
-#include "xrtheora_stream.h"
+#include "xrTheora_Surface.h"
+#include "xrTheora_Stream.h"
 
 CTheoraSurface::CTheoraSurface()
 {
diff --git a/src/xrEngine/Xr_input.cpp b/src/xrEngine/xr_input.cpp
similarity index 100%
rename from src/xrEngine/Xr_input.cpp
rename to src/xrEngine/xr_input.cpp
diff --git a/src/xrNetServer/NET_AuthCheck.h b/src/xrNetServer/NET_AuthCheck.h
index 4e3ed42a673..dda4e343ac1 100644
--- a/src/xrNetServer/NET_AuthCheck.h
+++ b/src/xrNetServer/NET_AuthCheck.h
@@ -2,7 +2,7 @@
 #ifndef NET_AUTH_CHECK_INCLUDED
 #define NET_AUTH_CHECK_INCLUDED
 
-#include "net_shared.h"
+#include "NET_Shared.h"
 
 using xr_auth_strings_t = xr_vector<shared_str>;
 void XRNETSERVER_API fill_auth_check_params(xr_auth_strings_t& ignore, xr_auth_strings_t& check);
diff --git a/src/xrNetServer/NET_Client.cpp b/src/xrNetServer/NET_Client.cpp
index a734e4a8260..c48c8ef69c3 100644
--- a/src/xrNetServer/NET_Client.cpp
+++ b/src/xrNetServer/NET_Client.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "NET_Common.h"
-#include "net_Client.h"
-#include "net_Server.h"
-#include "net_Messages.h"
+#include "NET_Client.h"
+#include "NET_Server.h"
+#include "NET_Messages.h"
 #include "NET_Log.h"
 #include "xrCore/Threading/Lock.hpp"
 
diff --git a/src/xrNetServer/NET_Log.cpp b/src/xrNetServer/NET_Log.cpp
index 48bbe18a805..8e5ce97465f 100644
--- a/src/xrNetServer/NET_Log.cpp
+++ b/src/xrNetServer/NET_Log.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "net_log.h"
+#include "NET_Log.h"
 #include "xrCore/Threading/Lock.hpp"
 //---------------------------------------------------------
 string64 PacketName[] = {"M_UPDATE", // DUAL: Update state
diff --git a/src/xrNetServer/NET_Server.h b/src/xrNetServer/NET_Server.h
index eb46867dfeb..66e58997718 100644
--- a/src/xrNetServer/NET_Server.h
+++ b/src/xrNetServer/NET_Server.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "net_shared.h"
+#include "NET_Shared.h"
 #include "ip_filter.h"
 #include "NET_Common.h"
 #include "NET_PlayersMonitor.h"
diff --git a/src/xrPhysics/ElevatorState.h b/src/xrPhysics/ElevatorState.h
index 48764c1cdd6..525003a6512 100644
--- a/src/xrPhysics/ElevatorState.h
+++ b/src/xrPhysics/ElevatorState.h
@@ -1,7 +1,7 @@
 #ifndef ELEVATOR_STAETE
 #define ELEVATOR_STAETE
 
-#include "ielevatorstate.h"
+#include "IElevatorState.h"
 class CPHCharacter;
 struct dContact;
 struct SGameMtl;
diff --git a/src/xrPhysics/ExtendedGeom.cpp b/src/xrPhysics/ExtendedGeom.cpp
index 3c10e9401d1..3a2480fe92d 100644
--- a/src/xrPhysics/ExtendedGeom.cpp
+++ b/src/xrPhysics/ExtendedGeom.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "extendedgeom.h"
-#include "dcylinder/dcylinder.h"
+#include "ExtendedGeom.h"
+#include "dcylinder/dCylinder.h"
 bool IsCyliderContact(const dContact& c)
 {
     int geomClass = -1;
diff --git a/src/xrPhysics/ExtendedGeom.h b/src/xrPhysics/ExtendedGeom.h
index 564974bc4f9..20d1bd91a4e 100644
--- a/src/xrPhysics/ExtendedGeom.h
+++ b/src/xrPhysics/ExtendedGeom.h
@@ -8,7 +8,7 @@
 
 #include <ode/common.h>
 #include <ode/collision.h>
-#include "physicscommon.h"
+#include "PhysicsCommon.h"
 #include "MathUtils.h"
 #ifdef DEBUG
 #include "debug_output.h"
diff --git a/src/xrPhysics/Geometry.h b/src/xrPhysics/Geometry.h
index fa9201fcf7b..d48e9fd84fb 100644
--- a/src/xrPhysics/Geometry.h
+++ b/src/xrPhysics/Geometry.h
@@ -3,8 +3,8 @@
 #define GEOMETRY_H
 #include "PhysicsCommon.h"
 #include "ExtendedGeom.h"
-#include "mathutilsode.h"
-#include "xrEngine/iphysicsgeometry.h"
+#include "MathUtilsOde.h"
+#include "xrEngine/IPhysicsGeometry.h"
 #include "xrCore/_cylinder.h"
 
 // this is equivalent dMULTIPLYOP0_333 whith consequent transposion of A
diff --git a/src/xrPhysics/GeometryBits.cpp b/src/xrPhysics/GeometryBits.cpp
index 6b62d22cce4..925eabaca06 100644
--- a/src/xrPhysics/GeometryBits.cpp
+++ b/src/xrPhysics/GeometryBits.cpp
@@ -2,8 +2,8 @@
 
 #include "GeometryBits.h"
 
-#include "phworld.h"
-#include "geometry.h"
+#include "PHWorld.h"
+#include "Geometry.h"
 
 enum geom_category { gct_static = 1 << 0, gct_dynamic = 1 << 1 };
 
diff --git a/src/xrPhysics/IActivationShape.cpp b/src/xrPhysics/IActivationShape.cpp
index 09c9d08cec2..af368752e13 100644
--- a/src/xrPhysics/IActivationShape.cpp
+++ b/src/xrPhysics/IActivationShape.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "iactivationshape.h"
-#include "phactivationshape.h"
-#include "physics.h"
-#include "iphysicsshellholder.h"
-#include "phcollidevalidator.h"
+#include "IActivationShape.h"
+#include "PHActivationShape.h"
+#include "Physics.h"
+#include "IPhysicsShellHolder.h"
+#include "PHCollideValidator.h"
 void ActivateShapeExplosive(IPhysicsShellHolder* self_obj, const Fvector& size, Fvector& out_size, Fvector& in_out_pos)
 {
     //////////////
diff --git a/src/xrPhysics/IPHStaticGeomShell.h b/src/xrPhysics/IPHStaticGeomShell.h
index 04a948fe952..9faa3957955 100644
--- a/src/xrPhysics/IPHStaticGeomShell.h
+++ b/src/xrPhysics/IPHStaticGeomShell.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "physicsexternalcommon.h"
+#include "PhysicsExternalCommon.h"
 class IPHStaticGeomShell
 {
 protected:
diff --git a/src/xrPhysics/IPHWorld.h b/src/xrPhysics/IPHWorld.h
index 961c1f6992b..d72cea391ce 100644
--- a/src/xrPhysics/IPHWorld.h
+++ b/src/xrPhysics/IPHWorld.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "physicsexternalcommon.h"
+#include "PhysicsExternalCommon.h"
 #include "iphysics_scripted.h"
 #include "xrCore/FTimer.h"
 #include "xrCDB/xrCDB.h" // build_callback
diff --git a/src/xrPhysics/MovementBoxDynamicActivate.cpp b/src/xrPhysics/MovementBoxDynamicActivate.cpp
index c653e63b2dc..d21717885ee 100644
--- a/src/xrPhysics/MovementBoxDynamicActivate.cpp
+++ b/src/xrPhysics/MovementBoxDynamicActivate.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 
-#include "movementboxdynamicactivate.h"
+#include "MovementBoxDynamicActivate.h"
 
 #include "ExtendedGeom.h"
 #include "MathUtils.h"
 #include "Physics.h"
 #include "ph_valid_ode.h"
 #include "MathUtilsOde.h"
-#include "iphysicsshellholder.h"
-#include "phcharacter.h"
+#include "IPhysicsShellHolder.h"
+#include "PHCharacter.h"
 #include "xrEngine/GameMtlLib.h"
 
 ObjectContactCallbackFun* saved_callback = 0;
diff --git a/src/xrPhysics/PHAICharacter.cpp b/src/xrPhysics/PHAICharacter.cpp
index ae7df06d1bf..881dde597f9 100644
--- a/src/xrPhysics/PHAICharacter.cpp
+++ b/src/xrPhysics/PHAICharacter.cpp
@@ -4,9 +4,9 @@
 #include "Physics.h"
 #include "ExtendedGeom.h"
 #include "xrCDB/Intersect.hpp"
-#include "tri-colliderKNoOPC\__aabb_tri.h"
+#include "tri-colliderknoopc/__aabb_tri.h"
 
-#include "phaicharacter.h"
+#include "PHAICharacter.h"
 #include "xrEngine/device.h"
 
 #ifdef DEBUG
diff --git a/src/xrPhysics/PHActivationShape.cpp b/src/xrPhysics/PHActivationShape.cpp
index 1576401f2e2..6a8744469da 100644
--- a/src/xrPhysics/PHActivationShape.cpp
+++ b/src/xrPhysics/PHActivationShape.cpp
@@ -3,9 +3,9 @@
 
 #include "Physics.h"
 #include "MathUtils.h"
-#include "phvalidevalues.h"
+#include "PHValideValues.h"
 
-#include "Extendedgeom.h"
+#include "ExtendedGeom.h"
 #include "SpaceUtils.h"
 #include "MathUtils.h"
 #include "xrEngine/GameMtlLib.h"
@@ -19,7 +19,7 @@
 
 #include "PHDynamicData.h"
 #include "xrServerEntities/PHSynchronize.h"
-#include "xrServerEntities/phnetstate.h"
+#include "xrServerEntities/PHNetState.h"
 static float max_depth = 0.f;
 static float friction_factor = 0.f;
 static const float cfm = 1.e-10f;
diff --git a/src/xrPhysics/PHActivationShape.h b/src/xrPhysics/PHActivationShape.h
index 8f5c5f0275d..4cf44e61cd5 100644
--- a/src/xrPhysics/PHActivationShape.h
+++ b/src/xrPhysics/PHActivationShape.h
@@ -2,7 +2,7 @@
 #define PH_ACTIVATION_SHAPE
 #endif
 
-#include "phvalidevalues.h"
+#include "PHValideValues.h"
 #include "PHObject.h"
 class IPhysicsShellHolder;
 class CPHActivationShape : public CPHObject
diff --git a/src/xrPhysics/PHActorCharacter.cpp b/src/xrPhysics/PHActorCharacter.cpp
index fae454c47a5..bf2a3bc231d 100644
--- a/src/xrPhysics/PHActorCharacter.cpp
+++ b/src/xrPhysics/PHActorCharacter.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "phactorcharacter.h"
-#include "Extendedgeom.h"
+#include "PHActorCharacter.h"
+#include "ExtendedGeom.h"
 #include "PhysicsCommon.h"
 
 #include "IPhysicsShellHolder.h"
diff --git a/src/xrPhysics/PHActorCharacter.h b/src/xrPhysics/PHActorCharacter.h
index e4285ed305a..a2449ae7831 100644
--- a/src/xrPhysics/PHActorCharacter.h
+++ b/src/xrPhysics/PHActorCharacter.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phsimplecharacter.h"
+#include "PHSimpleCharacter.h"
 #include "PHActorCharacterInline.h"
 
 class CPhysicShellHolder;
diff --git a/src/xrPhysics/PHCapture.cpp b/src/xrPhysics/PHCapture.cpp
index 817a1d63194..c35188faa8f 100644
--- a/src/xrPhysics/PHCapture.cpp
+++ b/src/xrPhysics/PHCapture.cpp
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
-#include "StdAfx.h"
+#include "stdafx.h"
 
 #include "PHCapture.h"
-#include "phcharacter.h"
+#include "PHCharacter.h"
 #include "Physics.h"
 #include "ExtendedGeom.h"
 
 #include "Include/xrRender/Kinematics.h"
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "xrEngine/device.h"
-#include "mathutilsode.h"
-#include "phelement.h"
+#include "MathUtilsOde.h"
+#include "PHElement.h"
 
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
diff --git a/src/xrPhysics/PHCaptureInit.cpp b/src/xrPhysics/PHCaptureInit.cpp
index c58c06a4ca9..bb0df5467ec 100644
--- a/src/xrPhysics/PHCaptureInit.cpp
+++ b/src/xrPhysics/PHCaptureInit.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
-#include "StdAfx.h"
-#include "phcharacter.h"
+#include "stdafx.h"
+#include "PHCharacter.h"
 #include "Physics.h"
 #include "ExtendedGeom.h"
 #include "PHCapture.h"
 
 #include "Include/xrRender/Kinematics.h"
 
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "xrEngine/device.h"
 extern class CPHWorld* ph_world;
@@ -248,7 +248,7 @@ void CPHCapture::Release()
 
     e_state = cstReleased;
 }
-#include "phelement.h"
+#include "PHElement.h"
 void CPHCapture::Deactivate()
 {
     Release();
diff --git a/src/xrPhysics/PHCharacter.cpp b/src/xrPhysics/PHCharacter.cpp
index 8f072944dc5..a89b4f0cc4c 100644
--- a/src/xrPhysics/PHCharacter.cpp
+++ b/src/xrPhysics/PHCharacter.cpp
@@ -1,19 +1,19 @@
 #include "stdafx.h"
 
-#include "phcharacter.h"
+#include "PHCharacter.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "ExtendedGeom.h"
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 
 #include "xrCDB/Intersect.hpp"
 #include "xrEngine/GameMtlLib.h"
 
-#include "tri-colliderKNoOPC\__aabb_tri.h"
+#include "tri-colliderknoopc/__aabb_tri.h"
 #include "ode/ode/src/util.h"
 #include "ph_valid_ode.h"
-#include "Phaicharacter.h"
-#include "phactorcharacter.h"
+#include "PHAICharacter.h"
+#include "PHActorCharacter.h"
 
 CPHCharacter::CPHCharacter(void) : CPHDisablingTranslational()
 {
diff --git a/src/xrPhysics/PHCollideValidator.cpp b/src/xrPhysics/PHCollideValidator.cpp
index 90de067849a..d2403030551 100644
--- a/src/xrPhysics/PHCollideValidator.cpp
+++ b/src/xrPhysics/PHCollideValidator.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PHObject.h"
-#include "phcollidevalidator.h"
+#include "PHCollideValidator.h"
 
 CGID CPHCollideValidator::freeGroupID = 0;
 _flags<CLClassBits> CPHCollideValidator::ClassFlags = {CLClassBits(0)};
@@ -61,10 +61,9 @@ void CPHCollideValidator::SetRagDollClassNotCollide(CPHObject& obj)
     obj.collide_class_bits().set(cbNCClassRagDoll, TRUE);
 }
 
-//Относит физический объект к классу анимированных объектов
+//Relates a physical object to the class of animated objects
 void CPHCollideValidator::SetAnimatedClass(CPHObject& obj) { obj.collide_class_bits().set(cbClassAnimated, TRUE); }
-//Задаёт игнорирование коллизий данного физического
-//объекта с анимированными телами
+//Sets ignoring collision of the physical object with animated objects (bodies)
 void CPHCollideValidator::SetAnimatedClassNotCollide(CPHObject& obj)
 {
     obj.collide_class_bits().set(cbNCClassAnimated, TRUE);
diff --git a/src/xrPhysics/PHCollideValidator.h b/src/xrPhysics/PHCollideValidator.h
index ac998825311..d04f3c8db0f 100644
--- a/src/xrPhysics/PHCollideValidator.h
+++ b/src/xrPhysics/PHCollideValidator.h
@@ -1,7 +1,7 @@
 #ifndef PH_COLLIDE_VALIDATOR
 #define PH_COLLIDE_VALIDATOR
 
-#include "icollidevalidator.h"
+#include "ICollideValidator.h"
 typedef u32 CLClassBits;
 typedef u32 CLBits;
 class CPHObject;
@@ -19,8 +19,8 @@ class CPHCollideValidator
         cbNCClassSmall = 1 << 7,
         cbClassRagDoll = 1 << 8,
         cbNCClassRagDoll = 1 << 9,
-        cbClassAnimated = 1 << 10, //класс анимированного физического объекта
-        cbNCClassAnimated = 1 << 11, //свойство игнорирования класса анимированного физического объекта
+        cbClassAnimated = 1 << 10, //animated physical object class
+        cbNCClassAnimated = 1 << 11, //ignore property of animated physical object class
         cbNone = 1 << 12
 
     };
diff --git a/src/xrPhysics/PHContactBodyEffector.cpp b/src/xrPhysics/PHContactBodyEffector.cpp
index 7a5656806d8..8cbe83a4703 100644
--- a/src/xrPhysics/PHContactBodyEffector.cpp
+++ b/src/xrPhysics/PHContactBodyEffector.cpp
@@ -4,7 +4,7 @@
 #include "tri-colliderknoopc/dTriList.h"
 #include "PhysicsCommon.h"
 #include "xrEngine/GameMtlLib.h"
-#include "mathutilsode.h"
+#include "MathUtilsOde.h"
 void CPHContactBodyEffector::Init(dBodyID body, const dContact& contact, SGameMtl* material)
 {
     CPHBaseBodyEffector::Init(body);
diff --git a/src/xrPhysics/PHDisabling.cpp b/src/xrPhysics/PHDisabling.cpp
index 3e0228facb3..940a2b40576 100644
--- a/src/xrPhysics/PHDisabling.cpp
+++ b/src/xrPhysics/PHDisabling.cpp
@@ -2,7 +2,7 @@
 #include "PHDisabling.h"
 #include "PhysicsCommon.h"
 #include "Physics.h"
-#include "mathutilsode.h"
+#include "MathUtilsOde.h"
 #ifdef DEBUG
 #include "debug_output.h"
 #endif
diff --git a/src/xrPhysics/PHElement.cpp b/src/xrPhysics/PHElement.cpp
index d9877c6928f..0431332788a 100644
--- a/src/xrPhysics/PHElement.cpp
+++ b/src/xrPhysics/PHElement.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHElement.h b/src/xrPhysics/PHElement.h
index c76bfaab653..a07ac800ecb 100644
--- a/src/xrPhysics/PHElement.h
+++ b/src/xrPhysics/PHElement.h
@@ -3,7 +3,7 @@
 ///////////////////////////Implemetation//for//CPhysicsElement//////////////////
 ////////////////////////////////////////////////////////////////////////////////
 #include "Geometry.h"
-#include "phdefs.h"
+#include "PHDefs.h"
 #include "PhysicsCommon.h"
 #include "xrServerEntities/PHSynchronize.h"
 #include "PHDisabling.h"
diff --git a/src/xrPhysics/PHElementNetState.cpp b/src/xrPhysics/PHElementNetState.cpp
index 660649d9490..cab1185df7f 100644
--- a/src/xrPhysics/PHElementNetState.cpp
+++ b/src/xrPhysics/PHElementNetState.cpp
@@ -1,10 +1,10 @@
-#include "StdAfx.h"
-#include "physicsshell.h"
-#include "phinterpolation.h"
-#include "phelement.h"
-#include "phobject.h"
-#include "phworld.h"
-#include "phshell.h"
+#include "stdafx.h"
+#include "PhysicsShell.h"
+#include "PHInterpolation.h"
+#include "PHElement.h"
+#include "PHObject.h"
+#include "PHWorld.h"
+#include "PHShell.h"
 
 void CPHElement::get_State(SPHNetState& state)
 {
diff --git a/src/xrPhysics/PHGeometryOwner.cpp b/src/xrPhysics/PHGeometryOwner.cpp
index 2b8947c1e25..ce872bf76b7 100644
--- a/src/xrPhysics/PHGeometryOwner.cpp
+++ b/src/xrPhysics/PHGeometryOwner.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PHGeometryOwner.h"
-#include "phworld.h"
+#include "PHWorld.h"
 
 #include "Include/xrRender/Kinematics.h"
 #include "xrCore/Animation/Bone.hpp"
diff --git a/src/xrPhysics/PHIsland.cpp b/src/xrPhysics/PHIsland.cpp
index 3d67e229e86..de1ba268f0e 100644
--- a/src/xrPhysics/PHIsland.cpp
+++ b/src/xrPhysics/PHIsland.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PHIsland.h"
-#include "physics.h"
+#include "Physics.h"
 #include "ph_valid_ode.h"
 void CPHIsland::Step(dReal step)
 {
diff --git a/src/xrPhysics/PHJoint.cpp b/src/xrPhysics/PHJoint.cpp
index e5ee989457d..7c0cf2fa58e 100644
--- a/src/xrPhysics/PHJoint.cpp
+++ b/src/xrPhysics/PHJoint.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHJointDestroyInfo.cpp b/src/xrPhysics/PHJointDestroyInfo.cpp
index d3fae083438..dd07c44f9a6 100644
--- a/src/xrPhysics/PHJointDestroyInfo.cpp
+++ b/src/xrPhysics/PHJointDestroyInfo.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "PHJointDestroyInfo.h"
 #include "PhysicsCommon.h"
-#include "mathutilsode.h"
+#include "MathUtilsOde.h"
 #include "console_vars.h"
 CPHJointDestroyInfo::CPHJointDestroyInfo(float break_force, float break_torque)
 {
diff --git a/src/xrPhysics/PHMoveStorage.cpp b/src/xrPhysics/PHMoveStorage.cpp
index f3e7ef46517..8e3b5f32b96 100644
--- a/src/xrPhysics/PHMoveStorage.cpp
+++ b/src/xrPhysics/PHMoveStorage.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "phmovestorage.h"
+#include "PHMoveStorage.h"
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #pragma warning(disable : 4267)
diff --git a/src/xrPhysics/PHMoveStorage.h b/src/xrPhysics/PHMoveStorage.h
index cb1d84a78fb..6f99955c51f 100644
--- a/src/xrPhysics/PHMoveStorage.h
+++ b/src/xrPhysics/PHMoveStorage.h
@@ -1,6 +1,6 @@
 #ifndef PHMOVESTORAGE_H
 #define PHMOVESTORAGE_H
-#include "phgeometryowner.h"
+#include "PHGeometryOwner.h"
 // DEFINE_VECTOR(dReal *&,POSITIONS_STORAGE,POSITIONS_I);
 
 class CPHPositionsPairs
diff --git a/src/xrPhysics/PHObject.h b/src/xrPhysics/PHObject.h
index e0e49b28919..f06a31c57de 100644
--- a/src/xrPhysics/PHObject.h
+++ b/src/xrPhysics/PHObject.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef CPHOBJECT
 #define CPHOBJECT
-#include "xrCDB/ispatial.h"
+#include "xrCDB/ISpatial.h"
 #include "PHItemList.h"
 #include "PHIsland.h"
 typedef u32 CLClassBits;
diff --git a/src/xrPhysics/PHShell.cpp b/src/xrPhysics/PHShell.cpp
index d22bd9688b4..ca5ace36a27 100644
--- a/src/xrPhysics/PHShell.cpp
+++ b/src/xrPhysics/PHShell.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
@@ -9,10 +9,10 @@
 #include "PHJointDestroyInfo.h"
 #include "SpaceUtils.h"
 #include "MathUtils.h"
-#include "iPhysicsShellHolder.h"
+#include "IPhysicsShellHolder.h"
 #include "Include/xrRender/Kinematics.h"
 #include "PHCollideValidator.h"
-#include "xrCore/animation/Bone.hpp"
+#include "xrCore/Animation/Bone.hpp"
 #include "xrEngine/GameMtlLib.h"
 
 //#pragma warning(push)
@@ -33,7 +33,7 @@
 #include "PHCollideValidator.h"
 #include "PHElementInline.h"
 #include "PhysicsShellAnimator.h"
-#include "phshellbuildjoint.h"
+#include "PHShellBuildJoint.h"
 #include "Common/Noncopyable.hpp"
 #ifdef DEBUG
 #include "debug_output.h"
@@ -1410,10 +1410,10 @@ void CPHShell::SetIgnoreStatic() { CPHCollideValidator::SetStaticNotCollide(*thi
 void CPHShell::SetIgnoreDynamic() { CPHCollideValidator::SetDynamicNotCollide(*this); }
 void CPHShell::SetRagDoll() { CPHCollideValidator::SetRagDollClass(*this); }
 void CPHShell::SetIgnoreRagDoll() { CPHCollideValidator::SetRagDollClassNotCollide(*this); }
-//Делает данный физический объек анимированным
+//Makes this physical object animated
 void CPHShell::CreateShellAnimator(CInifile const* ini, LPCSTR section)
 {
-    //Для фильтра коллизий относим данный объект к классу анимированных
+    //For the collision filter, we refer this object to the class of animated objects
     CPHCollideValidator::SetAnimatedClass(*this);
     m_pPhysicsShellAnimatorC = new CPhysicsShellAnimator(this, ini, section);
     VERIFY(PhysicsRefObject());
@@ -1421,17 +1421,17 @@ void CPHShell::CreateShellAnimator(CInifile const* ini, LPCSTR section)
     // m_pPhysicsShellAnimatorC->ResetCallbacks();
 }
 
-//Настраивает фильтр коллизий на игнорирование столкновенний данного
-//физического объекта с анимированным физическим объектом
+//Configures the collision filter to ignore the collision
+//of this physical object with an animated physical object
 void CPHShell::SetIgnoreAnimated()
 {
-    //Для фильтра коллизий указываем, что данный
-    //физический объект игнорирует анимированные физические тела
+    //For the collision filter, we indicate that this
+    //physical object ignores the animated physical objects (bodies)
 
     CPHCollideValidator::SetAnimatedClassNotCollide(*this);
 }
 
-//Выдает информацию о том является ли данный объект анимированным
+//Displays information about whether the object is animated
 
 void CPHShell::SetSmall() { CPHCollideValidator::SetClassSmall(*this); }
 void CPHShell::SetIgnoreSmall() { CPHCollideValidator::SetClassSmallNotCollide(*this); }
diff --git a/src/xrPhysics/PHShell.h b/src/xrPhysics/PHShell.h
index 230c511c909..5970de6da98 100644
--- a/src/xrPhysics/PHShell.h
+++ b/src/xrPhysics/PHShell.h
@@ -9,7 +9,7 @@ class CPHShellSplitterHolder;
 #include "PHElement.h"
 #include "PHDefs.h"
 #include "PHShellSplitter.h"
-#include "phmovestorage.h"
+#include "PHMoveStorage.h"
 #include "physics_scripted.h"
 
 class CPhysicsShellAnimator;
diff --git a/src/xrPhysics/PHShellActivate.cpp b/src/xrPhysics/PHShellActivate.cpp
index b543194eed9..3372395fcf0 100644
--- a/src/xrPhysics/PHShellActivate.cpp
+++ b/src/xrPhysics/PHShellActivate.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/PHShellSplitter.h b/src/xrPhysics/PHShellSplitter.h
index a5bd6f98a75..4fed6212909 100644
--- a/src/xrPhysics/PHShellSplitter.h
+++ b/src/xrPhysics/PHShellSplitter.h
@@ -3,7 +3,7 @@
 #include "PHDefs.h"
 
 #include "PHFracture.h"
-#include "phupdateobject.h"
+#include "PHUpdateObject.h"
 class CPHShellSplitter;
 
 class CPHShell;
diff --git a/src/xrPhysics/PHSimpleCharacter.cpp b/src/xrPhysics/PHSimpleCharacter.cpp
index 6dbcd214bf9..89ac67d607a 100644
--- a/src/xrPhysics/PHSimpleCharacter.cpp
+++ b/src/xrPhysics/PHSimpleCharacter.cpp
@@ -4,7 +4,7 @@
 #include "ExtendedGeom.h"
 #include "xrCDB/Intersect.hpp"
 #include "xrEngine/xr_object_list.h"
-#include "tri-colliderKNoOPC\__aabb_tri.h"
+#include "tri-colliderknoopc/__aabb_tri.h"
 #include "PHSimpleCharacter.h"
 #include "PHContactBodyEffector.h"
 
@@ -15,14 +15,14 @@
 
 #include "xrEngine/GameMtlLib.h"
 
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 #include "Include/xrRender/Kinematics.h"
 #include "PHSimpleCharacterInline.h"
 #include "DamageSource.h"
 #include "PHCollideValidator.h"
 #include "CalculateTriangle.h"
 
-#include "geometry.h"
+#include "Geometry.h"
 
 #include "xrCore/Animation/Bone.hpp"
 #include "xrEngine/xr_object.h"
@@ -1519,7 +1519,7 @@ void CPHSimpleCharacter::InitContact(dContact* c, bool& do_collide, u16 material
     bool object = (dGeomGetBody(g1) && dGeomGetBody(g2));
     b_on_object = b_on_object || object;
 
-    ////////////////////////нужно сместить колижен!!
+    ////////////////////////it is necessary to shift the collision!!
     //////////////
     FootProcess(c, do_collide, bo1);
     if (!do_collide)
diff --git a/src/xrPhysics/PHStaticGeomShell.cpp b/src/xrPhysics/PHStaticGeomShell.cpp
index ed4db9fdc70..2b2c9ec4035 100644
--- a/src/xrPhysics/PHStaticGeomShell.cpp
+++ b/src/xrPhysics/PHStaticGeomShell.cpp
@@ -3,8 +3,8 @@
 #include "SpaceUtils.h"
 
 #include "IPhysicsShellHolder.h"
-#include "phcharacter.h"
-#include "iclimableobject.h"
+#include "PHCharacter.h"
+#include "IClimableObject.h"
 
 #include "Include/xrRender/Kinematics.h"
 #include "PHCollideValidator.h"
diff --git a/src/xrPhysics/PHStaticGeomShell.h b/src/xrPhysics/PHStaticGeomShell.h
index 2d6f5002e7f..e2bc8aef9d8 100644
--- a/src/xrPhysics/PHStaticGeomShell.h
+++ b/src/xrPhysics/PHStaticGeomShell.h
@@ -2,8 +2,8 @@
 #define PH_STATIC_GEOM_SHELL_H
 #include "PHGeometryOwner.h"
 #include "PHObject.h"
-#include "phupdateobject.h"
-#include "iphstaticgeomshell.h"
+#include "PHUpdateObject.h"
+#include "IPHStaticGeomShell.h"
 class CPHStaticGeomShell : public CPHGeometryOwner, public CPHObject, public CPHUpdateObject, public IPHStaticGeomShell
 {
 #ifdef DEBUG
diff --git a/src/xrPhysics/PHValideValues.h b/src/xrPhysics/PHValideValues.h
index 798b8d68681..672a278645d 100644
--- a/src/xrPhysics/PHValideValues.h
+++ b/src/xrPhysics/PHValideValues.h
@@ -1,7 +1,7 @@
 #ifndef PH_VALIDE_VALUES
 #define PH_VALIDE_VALUES
 
-#include "mathutilsode.h"
+#include "MathUtilsOde.h"
 #include "ph_valid_ode.h"
 class CSafeValue
 {
diff --git a/src/xrPhysics/PHWorld.cpp b/src/xrPhysics/PHWorld.cpp
index bb61b771c01..fc14d308239 100644
--- a/src/xrPhysics/PHWorld.cpp
+++ b/src/xrPhysics/PHWorld.cpp
@@ -5,10 +5,10 @@
 #include "PhysicsCommon.h"
 
 #include "ExtendedGeom.h"
-#include "draymotions.h"
+#include "dRayMotions.h"
 #include "PHCollideValidator.h"
 #include "xrEngine/GameMtlLib.h"
-#include "xrEngine/Device.h"
+#include "xrEngine/device.h"
 #include "xrEngine/GameFont.h"
 #include "xrEngine/PerformanceAlert.hpp"
 
@@ -18,13 +18,13 @@
 #endif
 
 #include "xrServerEntities/PHSynchronize.h"
-#include "xrServerEntities/phnetstate.h"
-#include "geometrybits.h"
+#include "xrServerEntities/PHNetState.h"
+#include "GeometryBits.h"
 #include "console_vars.h"
 #include "xrEngine/device.h"
 #include "xrEngine/defines.h"
 #include "xrCDB/xr_area.h"
-#include "xrCore/fs_internal.h"
+#include "xrCore/FS_internal.h"
 #ifdef DEBUG
 //				void DBG_ObjAfterPhDataUpdate	( CPHObject *obj );
 //				void DBG_ObjBeforePhDataUpdate	( CPHObject *obj );
@@ -239,7 +239,7 @@ void CPHWorld::OnFrame()
 {
     stats.FrameStart();
 // Msg									("------------- physics: %d / %d",u32(Device.dwFrame),u32(m_steps_num));
-//просчитать полет пуль
+//calculate the flight of bullets
 /*
 Device.Statistic->TEST0.Begin		();
 Level().BulletManager().Update		();
diff --git a/src/xrPhysics/PHWorld.h b/src/xrPhysics/PHWorld.h
index 2e8b3aa1808..1f703df00b3 100644
--- a/src/xrPhysics/PHWorld.h
+++ b/src/xrPhysics/PHWorld.h
@@ -1,7 +1,7 @@
 #ifndef PH_WORLD_H
 #define PH_WORLD_H
 #include "Physics.h"
-#include "phupdateobject.h"
+#include "PHUpdateObject.h"
 #include "IPHWorld.h"
 #include "Common/Noncopyable.hpp"
 #include "physics_scripted.h"
diff --git a/src/xrPhysics/Physics.cpp b/src/xrPhysics/Physics.cpp
index 345ae502c06..e33b2e16bf9 100644
--- a/src/xrPhysics/Physics.cpp
+++ b/src/xrPhysics/Physics.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 
 #include <limits>
 
diff --git a/src/xrPhysics/Physics.h b/src/xrPhysics/Physics.h
index e7f53364dd3..b097ff2471f 100644
--- a/src/xrPhysics/Physics.h
+++ b/src/xrPhysics/Physics.h
@@ -1,7 +1,7 @@
 #ifndef PHYSICS_H
 #define PHYSICS_H
 
-#include "dCylinder/dCylinder.h"
+#include "dcylinder/dCylinder.h"
 #include "PhysicsShell.h"
 #include "PHObject.h"
 #include "PHInterpolation.h"
diff --git a/src/xrPhysics/PhysicsCommon.h b/src/xrPhysics/PhysicsCommon.h
index 24d26dfe9db..1f6bb73681c 100644
--- a/src/xrPhysics/PhysicsCommon.h
+++ b/src/xrPhysics/PhysicsCommon.h
@@ -2,7 +2,7 @@
 #define PHYSICS_COMMON_H
 
 #include "DisablingParams.h"
-#include "physicsexternalcommon.h"
+#include "PhysicsExternalCommon.h"
 
 extern XRPHYSICS_API const float default_l_limit;
 extern XRPHYSICS_API const float default_w_limit;
diff --git a/src/xrPhysics/PhysicsExternalCommon.cpp b/src/xrPhysics/PhysicsExternalCommon.cpp
index f6a9ec9bb9c..042f6fbbc2c 100644
--- a/src/xrPhysics/PhysicsExternalCommon.cpp
+++ b/src/xrPhysics/PhysicsExternalCommon.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "physicsexternalcommon.h"
-#include "extendedgeom.h"
-#include "mathutilsode.h"
+#include "PhysicsExternalCommon.h"
+#include "ExtendedGeom.h"
+#include "MathUtilsOde.h"
 bool ContactShotMarkGetEffectPars(dContactGeom* c, dxGeomUserData*& data, float& vel_cret, bool& b_invert_normal)
 {
     dBodyID b = dGeomGetBody(c->g1);
diff --git a/src/xrPhysics/PhysicsShell.cpp b/src/xrPhysics/PhysicsShell.cpp
index 45db3b85a6c..91994e44c9b 100644
--- a/src/xrPhysics/PhysicsShell.cpp
+++ b/src/xrPhysics/PhysicsShell.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #pragma hdrstop
-#include "physicsshell.h"
+#include "PhysicsShell.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "PHJoint.h"
@@ -9,7 +9,7 @@
 #include "PHJointDestroyInfo.h"
 #include "PHSplitedShell.h"
 
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 
 #include "phvalide.h"
 
diff --git a/src/xrPhysics/PhysicsShell.h b/src/xrPhysics/PhysicsShell.h
index ad9da74cea8..9cb522d6a69 100644
--- a/src/xrPhysics/PhysicsShell.h
+++ b/src/xrPhysics/PhysicsShell.h
@@ -4,12 +4,12 @@
 
 #include "PHDefs.h"
 #include "PhysicsCommon.h"
-#include "icollidevalidator.h"
+#include "ICollideValidator.h"
 #include "xrServerEntities/alife_space.h"
 #include "xrCore/_flags.h"
 #include "xrCore/xr_vector_defs.h"
 
-#include "xrEngine/iphysicsshell.h"
+#include "xrEngine/IPhysicsShell.h"
 #include "iphysics_scripted.h"
 
 // fwd. decl.
diff --git a/src/xrPhysics/PhysicsShellAnimator.cpp b/src/xrPhysics/PhysicsShellAnimator.cpp
index 51b7c8b121f..b8fdde1325d 100644
--- a/src/xrPhysics/PhysicsShellAnimator.cpp
+++ b/src/xrPhysics/PhysicsShellAnimator.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PhysicsShellAnimator.h"
 #include "PhysicsShellAnimatorBoneData.h"
 #include "Include/xrRender/KinematicsAnimated.h"
diff --git a/src/xrPhysics/ShellHit.cpp b/src/xrPhysics/ShellHit.cpp
index fe6efef94c4..c8f733d4453 100644
--- a/src/xrPhysics/ShellHit.cpp
+++ b/src/xrPhysics/ShellHit.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"
diff --git a/src/xrPhysics/collisiondamagereceiver.cpp b/src/xrPhysics/collisiondamagereceiver.cpp
index 9f164e79102..b0d13477626 100644
--- a/src/xrPhysics/collisiondamagereceiver.cpp
+++ b/src/xrPhysics/collisiondamagereceiver.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 
 #include "icollisiondamagereceiver.h"
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 
-#include "extendedgeom.h"
-#include "mathutilsode.h"
+#include "ExtendedGeom.h"
+#include "MathUtilsOde.h"
 
 #include "xrEngine/GameMtlLib.h"
 
diff --git a/src/xrPhysics/console_vars.cpp b/src/xrPhysics/console_vars.cpp
index 6083d2c0a93..dc5ed8d06ff 100644
--- a/src/xrPhysics/console_vars.cpp
+++ b/src/xrPhysics/console_vars.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "console_vars.h"
 
-#include "physicscommon.h"
+#include "PhysicsCommon.h"
 
 BOOL ph_console::g_bDebugDumpPhysicsStep = 0;
 float ph_console::ph_tri_query_ex_aabb_rate = 1.3f;
diff --git a/src/xrPhysics/dRayMotions.cpp b/src/xrPhysics/dRayMotions.cpp
index 1f2fc483a7b..04a7ec3cab8 100644
--- a/src/xrPhysics/dRayMotions.cpp
+++ b/src/xrPhysics/dRayMotions.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "dCylinder/dCylinder.h"
+#include "dcylinder/dCylinder.h"
 struct dContactGeom;
 int dCollideCylRay(dxGeom* o1, dxGeom* o2, int flags, dContactGeom* contact, int skip);
 
diff --git a/src/xrPhysics/dcylinder/dCylinder.cpp b/src/xrPhysics/dcylinder/dCylinder.cpp
index 7b34d6dd1da..7c97506a5cc 100644
--- a/src/xrPhysics/dcylinder/dCylinder.cpp
+++ b/src/xrPhysics/dcylinder/dCylinder.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "tri-colliderknoopc/dTriColliderCommon.h"
+#include <xrPhysics/tri-colliderknoopc/dTriColliderCommon.h>
 #include "dCylinder.h"
 #include "xrPhysics/ode_include.h"
 
diff --git a/src/xrPhysics/phvalide.cpp b/src/xrPhysics/phvalide.cpp
index 4695b358bc3..ce1126c30f4 100644
--- a/src/xrPhysics/phvalide.cpp
+++ b/src/xrPhysics/phvalide.cpp
@@ -2,7 +2,7 @@
 
 #include "phvalide.h"
 #include "MathUtils.h"
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 #ifdef DEBUG
 #include "xrCore/dump_string.h"
 #endif
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp
index 266b5c57acb..92aad211498 100644
--- a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp
+++ b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "dTriColliderCommon.h"
-#include "xrPhysics/dCylinder/dCylinder.h"
+#include "xrPhysics/dcylinder/dCylinder.h"
 #include "dTriCylinder.h"
 #include "xrPhysics/MathUtils.h"
-#include "dcTrilistCollider.h"
+#include "dcTriListCollider.h"
 #include "xrPhysics/PHWorld.h"
 #include "xrCDB/xr_area.h"
 
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h
index c62cc4740c0..0b7a05c5284 100644
--- a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h
+++ b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h
@@ -1,6 +1,6 @@
 #ifndef D_TRI_CYLINDER_H
 #define D_TRI_CYLINDER_H
-#include "xrPhysics/dCylinder/dCylinder.h"
+#include "xrPhysics/dcylinder/dCylinder.h"
 #include "TriPrimitiveCollideClassDef.h"
 #include "dcTriListCollider.h"
 
diff --git a/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp b/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp
index d541c085823..e03e45407ae 100644
--- a/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp
+++ b/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp
@@ -2,7 +2,7 @@
 #include "dTriColliderCommon.h"
 #include "dTriColliderMath.h"
 #include "dTriSphere.h"
-#include "dctrilistcollider.h"
+#include "dcTriListCollider.h"
 #include "xrPhysics/PHWorld.h"
 #include "xrCDB/xr_area.h"
 
diff --git a/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp b/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp
index 9a95fdf5a45..cf658e14d5f 100644
--- a/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp
+++ b/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp
@@ -2,7 +2,7 @@
 #include "xrCDB/Intersect.hpp"
 #include "dTriCollideK.h"
 #include "dSortTriPrimitive.h"
-#include "xrPhysics/dCylinder/dCylinder.h"
+#include "xrPhysics/dcylinder/dCylinder.h"
 #include "xrPhysics/MathUtils.h"
 #ifdef DEBUG
 #include "xrPhysics/debug_output.h"
diff --git a/src/xrScriptEngine/script_debugger.hpp b/src/xrScriptEngine/script_debugger.hpp
index 7123527c73f..38ff88c4b4f 100644
--- a/src/xrScriptEngine/script_debugger.hpp
+++ b/src/xrScriptEngine/script_debugger.hpp
@@ -3,7 +3,7 @@
 #include "xrScriptEngine/xrScriptEngine.hpp"
 #include "script_lua_helper.hpp"
 #include "script_debugger_threads.hpp"
-#include "script_CallStack.hpp"
+#include "script_callStack.hpp"
 #include "script_debugger_messages.hpp"
 
 class CMailSlotMsg;
diff --git a/src/xrScriptEngine/script_process.cpp b/src/xrScriptEngine/script_process.cpp
index ad49c92b2ac..613078e5fd4 100644
--- a/src/xrScriptEngine/script_process.cpp
+++ b/src/xrScriptEngine/script_process.cpp
@@ -10,7 +10,7 @@
 #include "script_engine.hpp"
 #include "script_process.hpp"
 #include "script_thread.hpp"
-#include "common/object_broker.h"
+#include "Common/object_broker.h"
 
 string4096 g_ca_stdout; // XXX: allocate dynamically for each CScriptEngine instance
 
diff --git a/src/xrSound/sound.cpp b/src/xrSound/Sound.cpp
similarity index 100%
rename from src/xrSound/sound.cpp
rename to src/xrSound/Sound.cpp
diff --git a/src/xrSound/SoundRender_Emitter_FSM.cpp b/src/xrSound/SoundRender_Emitter_FSM.cpp
index 27c7cba3718..72bc1702805 100644
--- a/src/xrSound/SoundRender_Emitter_FSM.cpp
+++ b/src/xrSound/SoundRender_Emitter_FSM.cpp
@@ -238,7 +238,7 @@ IC void volume_lerp(float& c, float t, float s, float dt)
     c += (diff / diff_a) * mot;
 }
 
-#include "xrServerEntities\ai_sounds.h"
+#include "xrServerEntities/ai_sounds.h"
 
 bool CSoundRender_Emitter::update_culling(float dt)
 {
diff --git a/src/xrSound/xr_streamsnd.cpp b/src/xrSound/xr_streamsnd.cpp
index d9cab267750..59a514fc6fa 100644
--- a/src/xrSound/xr_streamsnd.cpp
+++ b/src/xrSound/xr_streamsnd.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "soundrender.h"
-#include "soundrender_core.h"
+#include "SoundRender.h"
+#include "SoundRender_Core.h"
 #include "xr_streamsnd.h"
 
 const u32 dwDestBufSize = 44 * 1024;