diff --git a/src/body/CollisionBody.cpp b/src/body/CollisionBody.cpp
index 013bee26..84397665 100644
--- a/src/body/CollisionBody.cpp
+++ b/src/body/CollisionBody.cpp
@@ -268,6 +268,9 @@ void CollisionBody::setIsActive(bool isActive) {
 
     Body::setIsActive(isActive);
 
+    // Enable the components
+    mWorld.notifyBodyDisabled(mEntity, !isActive);
+
     // If we have to activate the body
     if (isActive) {
 
@@ -453,10 +456,12 @@ void CollisionBody::setTransform(const Transform& transform) {
 // Set the variable to know whether or not the body is sleeping
 void CollisionBody::setIsSleeping(bool isSleeping) {
 
+    if (mIsSleeping == isSleeping) return;
+
     Body::setIsSleeping(isSleeping);
 
     // Notify all the components
-    mWorld.notifyBodySleeping(mEntity, isSleeping);
+    mWorld.notifyBodyDisabled(mEntity, isSleeping);
 }
 
 // Return the world-space coordinates of a point given the local-space coordinates of the body
diff --git a/src/body/CollisionBody.h b/src/body/CollisionBody.h
index a9bbd729..461062ad 100644
--- a/src/body/CollisionBody.h
+++ b/src/body/CollisionBody.h
@@ -70,12 +70,6 @@ class CollisionBody : public Body {
         /// Type of body (static, kinematic or dynamic)
         BodyType mType;
 
-        /// First element of the linked list of proxy collision shapes of this body
-        //ProxyShape* mProxyCollisionShapes;
-
-        /// Number of collision shapes
-        //uint mNbCollisionShapes;
-
         /// First element of the linked list of contact manifolds involving this body
         ContactManifoldListElement* mContactManifoldsList;
 
diff --git a/src/components/BodyComponents.cpp b/src/components/BodyComponents.cpp
index b5f38609..8187492c 100644
--- a/src/components/BodyComponents.cpp
+++ b/src/components/BodyComponents.cpp
@@ -92,7 +92,7 @@ void BodyComponents::addComponent(Entity bodyEntity, bool isSleeping, const Body
 
     mNbComponents++;
 
-    assert(mSleepingStartIndex <= mNbComponents);
+    assert(mDisabledStartIndex <= mNbComponents);
     assert(mNbComponents == static_cast<uint32>(mMapEntityToComponentIndex.size()));
 }
 
diff --git a/src/components/BodyComponents.h b/src/components/BodyComponents.h
index e04d44a4..88edaa57 100644
--- a/src/components/BodyComponents.h
+++ b/src/components/BodyComponents.h
@@ -109,9 +109,6 @@ class BodyComponents : public Components {
 
         /// Return the list of proxy-shapes of a body
         const List<Entity>& getProxyShapes(Entity bodyEntity) const;
-
-        /// Notify if a given entity is sleeping or not
-        void setIsEntitySleeping(Entity bodyEntity, bool isSleeping);
 };
 
 // Add a proxy-shape to a body component
diff --git a/src/components/Components.cpp b/src/components/Components.cpp
index 5faa85ce..87e06e80 100644
--- a/src/components/Components.cpp
+++ b/src/components/Components.cpp
@@ -34,7 +34,7 @@ using namespace reactphysics3d;
 Components::Components(MemoryAllocator& allocator, size_t componentDataSize)
     : mMemoryAllocator(allocator), mNbComponents(0), mComponentDataSize(componentDataSize),
       mNbAllocatedComponents(0), mBuffer(nullptr), mMapEntityToComponentIndex(allocator),
-      mSleepingStartIndex(0) {
+      mDisabledStartIndex(0) {
 
 }
 
@@ -67,27 +67,27 @@ uint32 Components::prepareAddComponent(bool isSleeping) {
 
     uint32 index;
 
-    // If the component to add is part of a sleeping entity or there are no sleeping entity
+    // If the component to add is part of a disabled entity or there are no disabled entity
     if (isSleeping) {
 
         // Add the component at the end of the array
         index = mNbComponents;
 
-        mSleepingStartIndex = index;
+        mDisabledStartIndex = index;
     }
-    // If the component to add is not part of a sleeping entity
+    // If the component to add is not part of a disabled entity
     else {
 
-        // If there already are sleeping components
-        if (mSleepingStartIndex != mNbComponents) {
+        // If there already are disabled components
+        if (mDisabledStartIndex != mNbComponents) {
 
-            // Move the first sleeping component to the end of the array
-            moveComponentToIndex(mSleepingStartIndex, mNbComponents);
+            // Move the first disabled component to the end of the array
+            moveComponentToIndex(mDisabledStartIndex, mNbComponents);
         }
 
-        index = mSleepingStartIndex;
+        index = mDisabledStartIndex;
 
-        mSleepingStartIndex++;
+        mDisabledStartIndex++;
     }
 
     return index;
@@ -109,81 +109,81 @@ void Components::removeComponent(Entity entity) {
     assert(index < mNbComponents);
 
     // We want to keep the arrays tightly packed. Therefore, when a component is removed,
-    // we replace it with the last element of the array. But we need to make sure that sleeping
-    // and non-sleeping components stay grouped together.
+    // we replace it with the last element of the array. But we need to make sure that enabled
+    // and disabled components stay grouped together.
 
     // Destroy the component
     destroyComponent(index);
 
-    // If the component to remove is sleeping
-    if (index >= mSleepingStartIndex) {
+    // If the component to remove is disabled
+    if (index >= mDisabledStartIndex) {
 
         // If the component is not the last one
         if (index != mNbComponents - 1) {
 
-            // We replace it by the last sleeping component
+            // We replace it by the last disabled component
             moveComponentToIndex(mNbComponents - 1, index);
         }
     }
-    else {   // If the component to remove is not sleeping
+    else {   // If the component to remove is enabled
 
-        // If it not the last awake component
-        if (index != mSleepingStartIndex - 1) {
+        // If it not the last enabled component
+        if (index != mDisabledStartIndex - 1) {
 
-            // We replace it by the last awake component
-            moveComponentToIndex(mSleepingStartIndex - 1, index);
+            // We replace it by the last enabled component
+            moveComponentToIndex(mDisabledStartIndex - 1, index);
         }
 
-        // If there are sleeping components at the end
-        if (mSleepingStartIndex != mNbComponents) {
+        // If there are disabled components at the end
+        if (mDisabledStartIndex != mNbComponents) {
 
-            // We replace the last awake component by the last sleeping component
-            moveComponentToIndex(mNbComponents - 1, mSleepingStartIndex - 1);
+            // We replace the last enabled component by the last disabled component
+            moveComponentToIndex(mNbComponents - 1, mDisabledStartIndex - 1);
         }
 
-        mSleepingStartIndex--;
+        mDisabledStartIndex--;
     }
 
     mNbComponents--;
 
-    assert(mSleepingStartIndex <= mNbComponents);
+    assert(mDisabledStartIndex <= mNbComponents);
     assert(mNbComponents == static_cast<uint32>(mMapEntityToComponentIndex.size()));
 }
 
-// Notify if a given entity is sleeping or not
-void Components::setIsEntitySleeping(Entity entity, bool isSleeping) {
+// Notify if a given entity is disabled (sleeping or inactive) or not
+void Components::setIsEntityDisabled(Entity entity, bool isDisabled) {
 
     const uint32 index = mMapEntityToComponentIndex[entity];
 
-    // If the component was sleeping and is not sleeping anymore
-    if (!isSleeping && index >= mSleepingStartIndex) {
+    // If the component was disabled and is not disabled anymore
+    if (!isDisabled && index >= mDisabledStartIndex) {
 
-        assert(mSleepingStartIndex < mNbComponents);
+        assert(mDisabledStartIndex < mNbComponents);
 
-        // If the sleeping component is not the first sleeping component
-        if (mSleepingStartIndex != index) {
+        // If the disabled component is not the first disabled component
+        if (mDisabledStartIndex != index) {
 
-            // Swap the first sleeping component with the one we need to wake up
-            swapComponents(index, mSleepingStartIndex);
+            // Swap the first disabled component with the one we need to enable it
+            swapComponents(index, mDisabledStartIndex);
         }
 
-        mSleepingStartIndex++;
+        mDisabledStartIndex++;
     }
-    // If the component was awake and must now go to sleep
-    else if (isSleeping && index < mSleepingStartIndex) {
+    // If the component was enabled and must now be disabled
+    else if (isDisabled && index < mDisabledStartIndex) {
 
-        assert(mSleepingStartIndex > 0);
+        assert(mDisabledStartIndex > 0);
 
-        // If the awake component is not the only awake component
-        if (index != mSleepingStartIndex - 1) {
+        // If the enabled component is not the only enabled component
+        if (index != mDisabledStartIndex - 1) {
 
-            // Swap the last awake component with the one we need to put to sleep
-            swapComponents(index, mSleepingStartIndex - 1);
+            // Swap the last enabled component with the one we need to disable
+            swapComponents(index, mDisabledStartIndex - 1);
         }
 
-        mSleepingStartIndex--;
+        mDisabledStartIndex--;
     }
 
-    assert(mSleepingStartIndex <= mNbComponents);
+    assert(mDisabledStartIndex <= mNbComponents);
     assert(mNbComponents == static_cast<uint32>(mMapEntityToComponentIndex.size()));
 }
diff --git a/src/components/Components.h b/src/components/Components.h
index ab235321..4eb40ffe 100644
--- a/src/components/Components.h
+++ b/src/components/Components.h
@@ -75,8 +75,9 @@ class Components {
         /// Map an entity to the index of its component in the array
         Map<Entity, uint32> mMapEntityToComponentIndex;
 
-        /// Index of the first component of a sleeping entity (sleeping components are stored at the end)
-        uint32 mSleepingStartIndex;
+        /// Index of the first component of a disabled (sleeping or inactive) entity
+        /// Disabled components are stored at the end of the components array
+        uint32 mDisabledStartIndex;
 
         /// Compute the index where we need to insert the new component
         uint32 prepareAddComponent(bool isSleeping);
@@ -106,8 +107,8 @@ class Components {
         /// Remove a component
         void removeComponent(Entity entity);
 
-        // Notify if a given entity is sleeping or not
-        void setIsEntitySleeping(Entity entity, bool isSleeping);
+        // Notify if a given entity is disabled (sleeping or inactive) or not
+        void setIsEntityDisabled(Entity entity, bool isDisabled);
 
         /// Return the number of components
         uint32 getNbComponents() const;
diff --git a/src/components/ProxyShapesComponents.cpp b/src/components/ProxyShapesComponents.cpp
index eb49ce2f..62915c8b 100644
--- a/src/components/ProxyShapesComponents.cpp
+++ b/src/components/ProxyShapesComponents.cpp
@@ -125,7 +125,7 @@ void ProxyShapesComponents::addComponent(Entity proxyShapeEntity, bool isSleepin
 
     mNbComponents++;
 
-    assert(mSleepingStartIndex <= mNbComponents);
+    assert(mDisabledStartIndex <= mNbComponents);
 }
 
 // Move a component from a source to a destination index in the components array
diff --git a/src/components/TransformComponents.cpp b/src/components/TransformComponents.cpp
index aefeb0ba..b705e130 100644
--- a/src/components/TransformComponents.cpp
+++ b/src/components/TransformComponents.cpp
@@ -89,7 +89,7 @@ void TransformComponents::addComponent(Entity bodyEntity, bool isSleeping, const
 
     mNbComponents++;
 
-    assert(mSleepingStartIndex <= mNbComponents);
+    assert(mDisabledStartIndex <= mNbComponents);
     assert(mNbComponents == static_cast<uint32>(mMapEntityToComponentIndex.size()));
 }
 
diff --git a/src/engine/CollisionWorld.cpp b/src/engine/CollisionWorld.cpp
index cbc5e897..b3ad3864 100644
--- a/src/engine/CollisionWorld.cpp
+++ b/src/engine/CollisionWorld.cpp
@@ -246,19 +246,20 @@ void CollisionWorld::resetContactManifoldListsOfBodies() {
     }
 }
 
-// Notify the world if a body is sleeping or not
-void CollisionWorld::notifyBodySleeping(Entity bodyEntity, bool isSleeping) {
+// Notify the world if a body is disabled (sleeping or inactive) or not
+void CollisionWorld::notifyBodyDisabled(Entity bodyEntity, bool isDisabled) {
 
     // TODO : Make sure we notify all the components here ...
 
     // Notify all the components
-    mTransformComponents.setIsEntitySleeping(bodyEntity, isSleeping);
+    mBodyComponents.setIsEntityDisabled(bodyEntity, isDisabled);
+    mTransformComponents.setIsEntityDisabled(bodyEntity, isDisabled);
 
     // For each proxy-shape of the body
     const List<Entity>& proxyShapesEntities = mBodyComponents.getProxyShapes(bodyEntity);
     for (uint i=0; i < proxyShapesEntities.size(); i++) {
 
-        mProxyShapesComponents.setIsEntitySleeping(proxyShapesEntities[i], isSleeping);
+        mProxyShapesComponents.setIsEntityDisabled(proxyShapesEntities[i], isDisabled);
     }
 }
 
diff --git a/src/engine/CollisionWorld.h b/src/engine/CollisionWorld.h
index c29f8c34..910cbaee 100644
--- a/src/engine/CollisionWorld.h
+++ b/src/engine/CollisionWorld.h
@@ -129,8 +129,8 @@ class CollisionWorld {
         /// Reset all the contact manifolds linked list of each body
         void resetContactManifoldListsOfBodies();
 
-        /// Notify the world if a body is sleeping or not
-        void notifyBodySleeping(Entity entity, bool isSleeping);
+        /// Notify the world if a body is disabled (slepping or inactive) or not
+        void notifyBodyDisabled(Entity entity, bool isDisabled);
 
     public :