diff --git a/iOS/STK.xcodeproj/project.pbxproj b/iOS/STK.xcodeproj/project.pbxproj
index 435e4c1..ad889a9 100644
--- a/iOS/STK.xcodeproj/project.pbxproj
+++ b/iOS/STK.xcodeproj/project.pbxproj
@@ -202,8 +202,8 @@
 		B08F60DE18BA9B1800C14A90 /* SingWave.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SingWave.h; path = ../include/SingWave.h; sourceTree = "<group>"; };
 		B08F60DF18BA9B1800C14A90 /* Sitar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Sitar.h; sourceTree = "<group>"; };
 		B08F60E018BA9B1800C14A90 /* Skini.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Skini.h; path = ../include/Skini.h; sourceTree = "<group>"; };
-		B08F60E118BA9B1800C14A90 /* SKINI.msg */ = {isa = PBXFileReference; lastKnownFileType = text; name = SKINI.msg; path = ../include/SKINI.msg; sourceTree = "<group>"; };
-		B08F60E218BA9B1800C14A90 /* SKINI.tbl */ = {isa = PBXFileReference; lastKnownFileType = text; name = SKINI.tbl; path = ../include/SKINI.tbl; sourceTree = "<group>"; };
+		B08F60E118BA9B1800C14A90 /* SKINImsg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SKINImsg.h; path = ../include/SKINImsg.h; sourceTree = "<group>"; };
+		B08F60E218BA9B1800C14A90 /* SKINItbl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SKINItbl.h; path = ../include/SKINItbl.h; sourceTree = "<group>"; };
 		B08F60E418BA9B1800C14A90 /* Sphere.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Sphere.h; path = ../include/Sphere.h; sourceTree = "<group>"; };
 		B08F60E518BA9B1800C14A90 /* StifKarp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StifKarp.h; sourceTree = "<group>"; };
 		B08F60E618BA9B1800C14A90 /* Stk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Stk.h; path = ../include/Stk.h; sourceTree = "<group>"; };
@@ -666,8 +666,8 @@
 			children = (
 				B08F60E018BA9B1800C14A90 /* Skini.h */,
 				B08F617D18BA9B1800C14A90 /* Skini.cpp */,
-				B08F60E118BA9B1800C14A90 /* SKINI.msg */,
-				B08F60E218BA9B1800C14A90 /* SKINI.tbl */,
+				B08F60E118BA9B1800C14A90 /* SKINImsg.h */,
+				B08F60E218BA9B1800C14A90 /* SKINItbl.h */,
 			);
 			name = SKINI;
 			path = ../src;
diff --git a/include/SKINI.msg b/include/SKINImsg.h
similarity index 100%
rename from include/SKINI.msg
rename to include/SKINImsg.h
diff --git a/include/SKINI.tbl b/include/SKINItbl.h
similarity index 99%
rename from include/SKINI.tbl
rename to include/SKINItbl.h
index 6c9d47a..cfe1fda 100644
--- a/include/SKINI.tbl
+++ b/include/SKINItbl.h
@@ -1,5 +1,5 @@
 
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/BandedWG.cpp b/src/BandedWG.cpp
index eacd0d9..6f285cb 100644
--- a/src/BandedWG.cpp
+++ b/src/BandedWG.cpp
@@ -30,7 +30,7 @@
 /***************************************************/
 
 #include "BandedWG.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {
diff --git a/src/BlowBotl.cpp b/src/BlowBotl.cpp
index af9027b..8062896 100644
--- a/src/BlowBotl.cpp
+++ b/src/BlowBotl.cpp
@@ -17,7 +17,7 @@
 /***************************************************/
 
 #include "BlowBotl.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/BlowHole.cpp b/src/BlowHole.cpp
index 64a0aaf..49d733b 100644
--- a/src/BlowHole.cpp
+++ b/src/BlowHole.cpp
@@ -34,7 +34,7 @@
 /***************************************************/
 
 #include "BlowHole.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {
diff --git a/src/Bowed.cpp b/src/Bowed.cpp
index a30ffc3..28ebfb4 100644
--- a/src/Bowed.cpp
+++ b/src/Bowed.cpp
@@ -25,7 +25,7 @@
 /***************************************************/
 
 #include "Bowed.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Brass.cpp b/src/Brass.cpp
index 14f35d8..d85ebc3 100644
--- a/src/Brass.cpp
+++ b/src/Brass.cpp
@@ -21,7 +21,7 @@
 /***************************************************/
 
 #include "Brass.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {
diff --git a/src/Clarinet.cpp b/src/Clarinet.cpp
index 6e685cf..6ef2a4e 100644
--- a/src/Clarinet.cpp
+++ b/src/Clarinet.cpp
@@ -23,7 +23,7 @@
 /***************************************************/
 
 #include "Clarinet.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/FM.cpp b/src/FM.cpp
index 6cfffe7..66bf42d 100644
--- a/src/FM.cpp
+++ b/src/FM.cpp
@@ -24,7 +24,7 @@
 /***************************************************/
 
 #include "FM.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/FMVoices.cpp b/src/FMVoices.cpp
index 17bb65e..f0633e2 100644
--- a/src/FMVoices.cpp
+++ b/src/FMVoices.cpp
@@ -31,7 +31,7 @@
 /***************************************************/
 
 #include "FMVoices.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include "Phonemes.h"
 
 namespace stk {
diff --git a/src/Flute.cpp b/src/Flute.cpp
index c6af0d1..d493026 100644
--- a/src/Flute.cpp
+++ b/src/Flute.cpp
@@ -23,7 +23,7 @@
 /***************************************************/
 
 #include "Flute.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Guitar.cpp b/src/Guitar.cpp
index 6d6a27d..72a25c3 100644
--- a/src/Guitar.cpp
+++ b/src/Guitar.cpp
@@ -31,7 +31,7 @@
 #include "Guitar.h"
 #include "FileWvIn.h"
 #include "Noise.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {
diff --git a/src/Mandolin.cpp b/src/Mandolin.cpp
index 0034669..92daf5e 100644
--- a/src/Mandolin.cpp
+++ b/src/Mandolin.cpp
@@ -27,7 +27,7 @@
 /***************************************************/
 
 #include "Mandolin.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Mesh2D.cpp b/src/Mesh2D.cpp
index 56ea1c7..cc124d5 100644
--- a/src/Mesh2D.cpp
+++ b/src/Mesh2D.cpp
@@ -25,7 +25,7 @@
 /***************************************************/
 
 #include "Mesh2D.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Messager.cpp b/src/Messager.cpp
index 929f7e7..8b080fa 100644
--- a/src/Messager.cpp
+++ b/src/Messager.cpp
@@ -35,7 +35,7 @@
 #include "Messager.h"
 #include <iostream>
 #include <algorithm>
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/ModalBar.cpp b/src/ModalBar.cpp
index a3ca95a..b89685c 100644
--- a/src/ModalBar.cpp
+++ b/src/ModalBar.cpp
@@ -29,7 +29,7 @@
 /***************************************************/
 
 #include "ModalBar.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {
diff --git a/src/Moog.cpp b/src/Moog.cpp
index 870e907..fcb5fd6 100644
--- a/src/Moog.cpp
+++ b/src/Moog.cpp
@@ -19,7 +19,7 @@
 /***************************************************/
 
 #include "Moog.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Resonate.cpp b/src/Resonate.cpp
index 68ad9e0..e4b2ac4 100644
--- a/src/Resonate.cpp
+++ b/src/Resonate.cpp
@@ -18,7 +18,7 @@
 /***************************************************/
 
 #include "Resonate.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Saxofony.cpp b/src/Saxofony.cpp
index 80a19aa..92b2f55 100644
--- a/src/Saxofony.cpp
+++ b/src/Saxofony.cpp
@@ -36,7 +36,7 @@
 /***************************************************/
 
 #include "Saxofony.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Shakers.cpp b/src/Shakers.cpp
index bfaf122..80334c3 100644
--- a/src/Shakers.cpp
+++ b/src/Shakers.cpp
@@ -49,7 +49,7 @@
 /***************************************************/
 
 #include "Shakers.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Simple.cpp b/src/Simple.cpp
index 9df6ce8..ed32115 100644
--- a/src/Simple.cpp
+++ b/src/Simple.cpp
@@ -18,7 +18,7 @@
 /***************************************************/
 
 #include "Simple.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 
 namespace stk {
 
diff --git a/src/Skini.cpp b/src/Skini.cpp
index fff19f3..3e19c86 100644
--- a/src/Skini.cpp
+++ b/src/Skini.cpp
@@ -24,7 +24,7 @@
 /***************************************************/
 
 #include "Skini.h"
-#include "SKINI.tbl"
+#include "SKINItbl.h"
 #include <cstdlib>
 #include <sstream>
 
diff --git a/src/StifKarp.cpp b/src/StifKarp.cpp
index dde1505..e21dc9d 100644
--- a/src/StifKarp.cpp
+++ b/src/StifKarp.cpp
@@ -22,7 +22,7 @@
 /***************************************************/
 
 #include "StifKarp.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {
diff --git a/src/VoicForm.cpp b/src/VoicForm.cpp
index 56d85f9..13d655c 100644
--- a/src/VoicForm.cpp
+++ b/src/VoicForm.cpp
@@ -27,7 +27,7 @@
 
 #include "VoicForm.h"
 #include "Phonemes.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cstring>
 #include <cmath>
 
diff --git a/src/Whistle.cpp b/src/Whistle.cpp
index 459ba6c..9ff6eb7 100644
--- a/src/Whistle.cpp
+++ b/src/Whistle.cpp
@@ -17,7 +17,7 @@
 /***************************************************/
 
 #include "Whistle.h"
-#include "SKINI.msg"
+#include "SKINImsg.h"
 #include <cmath>
 
 namespace stk {