diff --git a/libspinscale b/libspinscale
index e813962..01a9c6e 160000
--- a/libspinscale
+++ b/libspinscale
@@ -1 +1 @@
-Subproject commit e81396216830f0c69a2fc3a11ea449783c4028fa
+Subproject commit 01a9c6ecc924833bcc9f49ccc716fbc99a057321
diff --git a/smocore/body/body.cpp b/smocore/body/body.cpp
index bf45eee..d9266c8 100644
--- a/smocore/body/body.cpp
+++ b/smocore/body/body.cpp
@@ -14,7 +14,7 @@
 namespace smo {
 namespace body {
 
-Body::Body(Mind &parent, const std::shared_ptr<sscl::ComponentThread> &thread)
+Body::Body(Mind &parent, const std::shared_ptr<sscl::PuppetThread> &thread)
 :	sscl::PuppetComponent(static_cast<sscl::PuppetApplication&>(parent), thread)
 {
 }
diff --git a/smocore/director/director.cpp b/smocore/director/director.cpp
index 3854406..c210716 100644
--- a/smocore/director/director.cpp
+++ b/smocore/director/director.cpp
@@ -6,7 +6,8 @@
 namespace smo {
 namespace director {
 
-Director::Director(Mind &parent, const std::shared_ptr<sscl::ComponentThread> &thread)
+Director::Director(
+	Mind &parent, const std::shared_ptr<sscl::PuppetThread> &thread)
 :	sscl::PuppetComponent(static_cast<sscl::PuppetApplication&>(parent), thread)
 {
 }
diff --git a/smocore/include/body/body.h b/smocore/include/body/body.h
index 58ffb06..e6c2a7d 100644
--- a/smocore/include/body/body.h
+++ b/smocore/include/body/body.h
@@ -16,7 +16,7 @@ class Body
 :	public sscl::PuppetComponent
 {
 public:
-	Body(Mind &parent, const std::shared_ptr<sscl::ComponentThread> &thread);
+	Body(Mind &parent, const std::shared_ptr<sscl::PuppetThread> &thread);
 	~Body() = default;
 
 	typedef std::function<void(bool)> bodyLifetimeMgmtOpCbFn;
diff --git a/smocore/include/director/director.h b/smocore/include/director/director.h
index 83b4964..ce488f5 100644
--- a/smocore/include/director/director.h
+++ b/smocore/include/director/director.h
@@ -17,7 +17,7 @@ class Director
 :	public sscl::PuppetComponent
 {
 public:
-    Director(Mind &parent, const std::shared_ptr<sscl::ComponentThread> &thread);
+    Director(Mind &parent, const std::shared_ptr<sscl::PuppetThread> &thread);
 	~Director() = default;
 
 	void negtrinEventInd(void);
diff --git a/smocore/include/simulator/simulator.h b/smocore/include/simulator/simulator.h
index da9c273..76ef3e8 100644
--- a/smocore/include/simulator/simulator.h
+++ b/smocore/include/simulator/simulator.h
@@ -16,7 +16,7 @@ class Simulator
 :	public sscl::PuppetComponent
 {
 public:
-    Simulator(Mind &parent, const std::shared_ptr<sscl::ComponentThread> &thread);
+    Simulator(Mind &parent, const std::shared_ptr<sscl::PuppetThread> &thread);
 	~Simulator() = default;
 
     void initialize();
diff --git a/smocore/mind.cpp b/smocore/mind.cpp
index b86ba2a..6ba9946 100644
--- a/smocore/mind.cpp
+++ b/smocore/mind.cpp
@@ -14,7 +14,7 @@
 namespace smo {
 
 Mind::Mind(void)
-	: sscl::PuppetApplication(
+:	sscl::PuppetApplication(
 		std::vector<std::shared_ptr<sscl::PuppetThread>>{
 			std::make_shared<MindThread>(SmoThreadId::DIRECTOR, *this),
 			std::make_shared<MindThread>(SmoThreadId::SIMULATOR, *this),
diff --git a/smocore/simulator/simulator.cpp b/smocore/simulator/simulator.cpp
index 504d5bd..0cc28c5 100644
--- a/smocore/simulator/simulator.cpp
+++ b/smocore/simulator/simulator.cpp
@@ -4,7 +4,8 @@
 namespace smo {
 namespace simulator {
 
-Simulator::Simulator(Mind &parent, const std::shared_ptr<sscl::ComponentThread> &thread)
+Simulator::Simulator(
+	Mind &parent, const std::shared_ptr<sscl::PuppetThread> &thread)
 :	sscl::PuppetComponent(static_cast<sscl::PuppetApplication&>(parent), thread)
 {
 }