Fixed up header guards

66 files changed, 132 insertions, 132 deletions

diff --git a/sigmodr/tree/AbilityGroupModel.h b/sigmodr/tree/AbilityGroupModel.h
index 70815bcd..5583369d 100644
--- a/sigmodr/tree/AbilityGroupModel.h
+++ b/sigmodr/tree/AbilityGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_ABILITYGROUPMODEL
-#define SIGMODR_ABILITYGROUPMODEL
+#ifndef SIGMODRTREE_ABILITYGROUPMODEL
+#define SIGMODRTREE_ABILITYGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/AbilityModel.h b/sigmodr/tree/AbilityModel.h
index 36fb4896..614f9eeb 100644
--- a/sigmodr/tree/AbilityModel.h
+++ b/sigmodr/tree/AbilityModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_ABILITYMODEL
-#define SIGMODR_ABILITYMODEL
+#ifndef SIGMODRTREE_ABILITYMODEL
+#define SIGMODRTREE_ABILITYMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/AuthorGroupModel.h b/sigmodr/tree/AuthorGroupModel.h
index 6f75b703..44503a27 100644
--- a/sigmodr/tree/AuthorGroupModel.h
+++ b/sigmodr/tree/AuthorGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_AUTHORGROUPMODEL
-#define SIGMODR_AUTHORGROUPMODEL
+#ifndef SIGMODRTREE_AUTHORGROUPMODEL
+#define SIGMODRTREE_AUTHORGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/AuthorModel.h b/sigmodr/tree/AuthorModel.h
index 10e5ec67..10b27aad 100644
--- a/sigmodr/tree/AuthorModel.h
+++ b/sigmodr/tree/AuthorModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_AUTHORMODEL
-#define SIGMODR_AUTHORMODEL
+#ifndef SIGMODRTREE_AUTHORMODEL
+#define SIGMODRTREE_AUTHORMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/BadgeGroupModel.h b/sigmodr/tree/BadgeGroupModel.h
index 281930f7..e47249d5 100644
--- a/sigmodr/tree/BadgeGroupModel.h
+++ b/sigmodr/tree/BadgeGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_BADGEGROUPMODEL
-#define SIGMODR_BADGEGROUPMODEL
+#ifndef SIGMODRTREE_BADGEGROUPMODEL
+#define SIGMODRTREE_BADGEGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/BadgeModel.h b/sigmodr/tree/BadgeModel.h
index 88a73a87..4a91427d 100644
--- a/sigmodr/tree/BadgeModel.h
+++ b/sigmodr/tree/BadgeModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_BADGEMODEL
-#define SIGMODR_BADGEMODEL
+#ifndef SIGMODRTREE_BADGEMODEL
+#define SIGMODRTREE_BADGEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/BaseModel.h b/sigmodr/tree/BaseModel.h
index b0c9e91a..f5d38725 100644
--- a/sigmodr/tree/BaseModel.h
+++ b/sigmodr/tree/BaseModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_BASEMODEL
-#define SIGMODR_BASEMODEL
+#ifndef SIGMODRTREE_BASEMODEL
+#define SIGMODRTREE_BASEMODEL
 
 // Sigmodr tree includes
 #include "Global.h"
diff --git a/sigmodr/tree/BaseObjectModel.h b/sigmodr/tree/BaseObjectModel.h
index f16b8cf0..fb4a14d7 100644
--- a/sigmodr/tree/BaseObjectModel.h
+++ b/sigmodr/tree/BaseObjectModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_BASEOBJECTMODEL
-#define SIGMODR_BASEOBJECTMODEL
+#ifndef SIGMODRTREE_BASEOBJECTMODEL
+#define SIGMODRTREE_BASEOBJECTMODEL
 
 // Sigmodr tree includes
 #include "BaseModel.h"
diff --git a/sigmodr/tree/CoinListGroupModel.h b/sigmodr/tree/CoinListGroupModel.h
index 6b4dbc59..6292ecf4 100644
--- a/sigmodr/tree/CoinListGroupModel.h
+++ b/sigmodr/tree/CoinListGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_COINLISTGROUPMODEL
-#define SIGMODR_COINLISTGROUPMODEL
+#ifndef SIGMODRTREE_COINLISTGROUPMODEL
+#define SIGMODRTREE_COINLISTGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/CoinListItemModel.h b/sigmodr/tree/CoinListItemModel.h
index 622993ec..a40c6f91 100644
--- a/sigmodr/tree/CoinListItemModel.h
+++ b/sigmodr/tree/CoinListItemModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_COINLISTITEMMODEL
-#define SIGMODR_COINLISTITEMMODEL
+#ifndef SIGMODRTREE_COINLISTITEMMODEL
+#define SIGMODRTREE_COINLISTITEMMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/CoinListModel.h b/sigmodr/tree/CoinListModel.h
index 610670a3..c48b22d6 100644
--- a/sigmodr/tree/CoinListModel.h
+++ b/sigmodr/tree/CoinListModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_COINLISTMODEL
-#define SIGMODR_COINLISTMODEL
+#ifndef SIGMODRTREE_COINLISTMODEL
+#define SIGMODRTREE_COINLISTMODEL
 
 // Sigmodr tree includes
 #include "GroupObjectModel.h"
diff --git a/sigmodr/tree/EggGroupGroupModel.h b/sigmodr/tree/EggGroupGroupModel.h
index ceabb743..0b537f6e 100644
--- a/sigmodr/tree/EggGroupGroupModel.h
+++ b/sigmodr/tree/EggGroupGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_EGGGROUPGROUPMODEL
-#define SIGMODR_EGGGROUPGROUPMODEL
+#ifndef SIGMODRTREE_EGGGROUPGROUPMODEL
+#define SIGMODRTREE_EGGGROUPGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/EggGroupModel.h b/sigmodr/tree/EggGroupModel.h
index 0a8e00bb..38f7de93 100644
--- a/sigmodr/tree/EggGroupModel.h
+++ b/sigmodr/tree/EggGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_EGGGROUPMODEL
-#define SIGMODR_EGGGROUPMODEL
+#ifndef SIGMODRTREE_EGGGROUPMODEL
+#define SIGMODRTREE_EGGGROUPMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/GlobalScriptGroupModel.h b/sigmodr/tree/GlobalScriptGroupModel.h
index 63aaa3c8..e5978dc7 100644
--- a/sigmodr/tree/GlobalScriptGroupModel.h
+++ b/sigmodr/tree/GlobalScriptGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_GLOBALSCRIPTGROUPMODEL
-#define SIGMODR_GLOBALSCRIPTGROUPMODEL
+#ifndef SIGMODRTREE_GLOBALSCRIPTGROUPMODEL
+#define SIGMODRTREE_GLOBALSCRIPTGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/GlobalScriptModel.h b/sigmodr/tree/GlobalScriptModel.h
index 5a91de91..f7d9d18a 100644
--- a/sigmodr/tree/GlobalScriptModel.h
+++ b/sigmodr/tree/GlobalScriptModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_GLOBALSCRIPTMODEL
-#define SIGMODR_GLOBALSCRIPTMODEL
+#ifndef SIGMODRTREE_GLOBALSCRIPTMODEL
+#define SIGMODRTREE_GLOBALSCRIPTMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/GroupModel.h b/sigmodr/tree/GroupModel.h
index 7c07eab0..2fe93c11 100644
--- a/sigmodr/tree/GroupModel.h
+++ b/sigmodr/tree/GroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_GROUPMODEL
-#define SIGMODR_GROUPMODEL
+#ifndef SIGMODRTREE_GROUPMODEL
+#define SIGMODRTREE_GROUPMODEL
 
 // Sigmodr tree includes
 #include "BaseModel.h"
diff --git a/sigmodr/tree/GroupObjectModel.h b/sigmodr/tree/GroupObjectModel.h
index 2dd1e666..f04719a3 100644
--- a/sigmodr/tree/GroupObjectModel.h
+++ b/sigmodr/tree/GroupObjectModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_GROUPOBJECTMODEL
-#define SIGMODR_GROUPOBJECTMODEL
+#ifndef SIGMODRTREE_GROUPOBJECTMODEL
+#define SIGMODRTREE_GROUPOBJECTMODEL
 
 // Sigmodr tree includes
 #include "BaseObjectModel.h"
diff --git a/sigmodr/tree/Grouping.h b/sigmodr/tree/Grouping.h
index 40d68c0c..e14e58ae 100644
--- a/sigmodr/tree/Grouping.h
+++ b/sigmodr/tree/Grouping.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_GROUPING
-#define SIGMODR_GROUPING
+#ifndef SIGMODRTREE_GROUPING
+#define SIGMODRTREE_GROUPING
 
 // Sigmodr tree includes
 #include "Global.h"
diff --git a/sigmodr/tree/ItemGroupModel.h b/sigmodr/tree/ItemGroupModel.h
index e5573aa5..6aa974ff 100644
--- a/sigmodr/tree/ItemGroupModel.h
+++ b/sigmodr/tree/ItemGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_ITEMGROUPMODEL
-#define SIGMODR_ITEMGROUPMODEL
+#ifndef SIGMODRTREE_ITEMGROUPMODEL
+#define SIGMODRTREE_ITEMGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/ItemModel.h b/sigmodr/tree/ItemModel.h
index c456bcc7..822bf4ee 100644
--- a/sigmodr/tree/ItemModel.h
+++ b/sigmodr/tree/ItemModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_ITEMMODEL
-#define SIGMODR_ITEMMODEL
+#ifndef SIGMODRTREE_ITEMMODEL
+#define SIGMODRTREE_ITEMMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/ItemTypeGroupModel.h b/sigmodr/tree/ItemTypeGroupModel.h
index a7848736..684acc6e 100644
--- a/sigmodr/tree/ItemTypeGroupModel.h
+++ b/sigmodr/tree/ItemTypeGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_ITEMTYPEGROUPMODEL
-#define SIGMODR_ITEMTYPEGROUPMODEL
+#ifndef SIGMODRTREE_ITEMTYPEGROUPMODEL
+#define SIGMODRTREE_ITEMTYPEGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/ItemTypeModel.h b/sigmodr/tree/ItemTypeModel.h
index 5f808610..11930425 100644
--- a/sigmodr/tree/ItemTypeModel.h
+++ b/sigmodr/tree/ItemTypeModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_ITEMTYPEMODEL
-#define SIGMODR_ITEMTYPEMODEL
+#ifndef SIGMODRTREE_ITEMTYPEMODEL
+#define SIGMODRTREE_ITEMTYPEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/MapEffectGroupModel.h b/sigmodr/tree/MapEffectGroupModel.h
index 2f980631..cdb158d8 100644
--- a/sigmodr/tree/MapEffectGroupModel.h
+++ b/sigmodr/tree/MapEffectGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPEFFECTGROUPMODEL
-#define SIGMODR_MAPEFFECTGROUPMODEL
+#ifndef SIGMODRTREE_MAPEFFECTGROUPMODEL
+#define SIGMODRTREE_MAPEFFECTGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/MapEffectModel.h b/sigmodr/tree/MapEffectModel.h
index 3a7cda14..d9879b4c 100644
--- a/sigmodr/tree/MapEffectModel.h
+++ b/sigmodr/tree/MapEffectModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPEFFECTMODEL
-#define SIGMODR_MAPEFFECTMODEL
+#ifndef SIGMODRTREE_MAPEFFECTMODEL
+#define SIGMODRTREE_MAPEFFECTMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/MapGroupModel.h b/sigmodr/tree/MapGroupModel.h
index 1922c347..376b9d41 100644
--- a/sigmodr/tree/MapGroupModel.h
+++ b/sigmodr/tree/MapGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPGROUPMODEL
-#define SIGMODR_MAPGROUPMODEL
+#ifndef SIGMODRTREE_MAPGROUPMODEL
+#define SIGMODRTREE_MAPGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/MapModel.h b/sigmodr/tree/MapModel.h
index 88544bcb..a044ca26 100644
--- a/sigmodr/tree/MapModel.h
+++ b/sigmodr/tree/MapModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPMODEL
-#define SIGMODR_MAPMODEL
+#ifndef SIGMODRTREE_MAPMODEL
+#define SIGMODRTREE_MAPMODEL
 
 // Sigmodr tree includes
 #include "GroupObjectModel.h"
diff --git a/sigmodr/tree/MapTrainerGroupModel.h b/sigmodr/tree/MapTrainerGroupModel.h
index 137b5189..9cf82865 100644
--- a/sigmodr/tree/MapTrainerGroupModel.h
+++ b/sigmodr/tree/MapTrainerGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPTRAINERGROUPMODEL
-#define SIGMODR_MAPTRAINERGROUPMODEL
+#ifndef SIGMODRTREE_MAPTRAINERGROUPMODEL
+#define SIGMODRTREE_MAPTRAINERGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/MapTrainerModel.h b/sigmodr/tree/MapTrainerModel.h
index 78d20b3c..d3177edc 100644
--- a/sigmodr/tree/MapTrainerModel.h
+++ b/sigmodr/tree/MapTrainerModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPTRAINERMODEL
-#define SIGMODR_MAPTRAINERMODEL
+#ifndef SIGMODRTREE_MAPTRAINERMODEL
+#define SIGMODRTREE_MAPTRAINERMODEL
 
 // Sigmodr tree includes
 #include "GroupObjectModel.h"
diff --git a/sigmodr/tree/MapTrainerTeamMemberModel.h b/sigmodr/tree/MapTrainerTeamMemberModel.h
index b52c6047..53f10a23 100644
--- a/sigmodr/tree/MapTrainerTeamMemberModel.h
+++ b/sigmodr/tree/MapTrainerTeamMemberModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPTRAINERTEAMMEMBERMODEL
-#define SIGMODR_MAPTRAINERTEAMMEMBERMODEL
+#ifndef SIGMODRTREE_MAPTRAINERTEAMMEMBERMODEL
+#define SIGMODRTREE_MAPTRAINERTEAMMEMBERMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/MapWarpModel.h b/sigmodr/tree/MapWarpModel.h
index 6617e840..03c83f8d 100644
--- a/sigmodr/tree/MapWarpModel.h
+++ b/sigmodr/tree/MapWarpModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPWARPMODEL
-#define SIGMODR_MAPWARPMODEL
+#ifndef SIGMODRTREE_MAPWARPMODEL
+#define SIGMODRTREE_MAPWARPMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/MapWildListEncounterModel.h b/sigmodr/tree/MapWildListEncounterModel.h
index 11d254af..51b75a9d 100644
--- a/sigmodr/tree/MapWildListEncounterModel.h
+++ b/sigmodr/tree/MapWildListEncounterModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPWILDLISTENCOUNTERMODEL
-#define SIGMODR_MAPWILDLISTENCOUNTERMODEL
+#ifndef SIGMODRTREE_MAPWILDLISTENCOUNTERMODEL
+#define SIGMODRTREE_MAPWILDLISTENCOUNTERMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/MapWildListGroupModel.h b/sigmodr/tree/MapWildListGroupModel.h
index 1d6ad5b9..0b635a5b 100644
--- a/sigmodr/tree/MapWildListGroupModel.h
+++ b/sigmodr/tree/MapWildListGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPWILDLISTGROUPMODEL
-#define SIGMODR_MAPWILDLISTGROUPMODEL
+#ifndef SIGMODRTREE_MAPWILDLISTGROUPMODEL
+#define SIGMODRTREE_MAPWILDLISTGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/MapWildListModel.h b/sigmodr/tree/MapWildListModel.h
index 2b49ffcd..2839fd23 100644
--- a/sigmodr/tree/MapWildListModel.h
+++ b/sigmodr/tree/MapWildListModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MAPWILDLISTMODEL
-#define SIGMODR_MAPWILDLISTMODEL
+#ifndef SIGMODRTREE_MAPWILDLISTMODEL
+#define SIGMODRTREE_MAPWILDLISTMODEL
 
 // Sigmodr tree includes
 #include "GroupObjectModel.h"
diff --git a/sigmodr/tree/MoveGroupModel.h b/sigmodr/tree/MoveGroupModel.h
index 61566791..9a9eb647 100644
--- a/sigmodr/tree/MoveGroupModel.h
+++ b/sigmodr/tree/MoveGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MOVEGROUPMODEL
-#define SIGMODR_MOVEGROUPMODEL
+#ifndef SIGMODRTREE_MOVEGROUPMODEL
+#define SIGMODRTREE_MOVEGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/MoveModel.h b/sigmodr/tree/MoveModel.h
index 1dc5727d..d75746e3 100644
--- a/sigmodr/tree/MoveModel.h
+++ b/sigmodr/tree/MoveModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_MOVEMODEL
-#define SIGMODR_MOVEMODEL
+#ifndef SIGMODRTREE_MOVEMODEL
+#define SIGMODRTREE_MOVEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/NatureGroupModel.h b/sigmodr/tree/NatureGroupModel.h
index fbb530c8..4aa94bb4 100644
--- a/sigmodr/tree/NatureGroupModel.h
+++ b/sigmodr/tree/NatureGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_NATUREGROUPMODEL
-#define SIGMODR_NATUREGROUPMODEL
+#ifndef SIGMODRTREE_NATUREGROUPMODEL
+#define SIGMODRTREE_NATUREGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/NatureModel.h b/sigmodr/tree/NatureModel.h
index fe6fc52e..055bbcb1 100644
--- a/sigmodr/tree/NatureModel.h
+++ b/sigmodr/tree/NatureModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_NATUREMODEL
-#define SIGMODR_NATUREMODEL
+#ifndef SIGMODRTREE_NATUREMODEL
+#define SIGMODRTREE_NATUREMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/ObjectModel.h b/sigmodr/tree/ObjectModel.h
index 8b1f7220..6b6dad52 100644
--- a/sigmodr/tree/ObjectModel.h
+++ b/sigmodr/tree/ObjectModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_OBJECTMODEL
-#define SIGMODR_OBJECTMODEL
+#ifndef SIGMODRTREE_OBJECTMODEL
+#define SIGMODRTREE_OBJECTMODEL
 
 // Sigmodr tree includes
 #include "BaseObjectModel.h"
diff --git a/sigmodr/tree/RootModel.h b/sigmodr/tree/RootModel.h
index c67d677e..a412483f 100644
--- a/sigmodr/tree/RootModel.h
+++ b/sigmodr/tree/RootModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_ROOTMODEL
-#define SIGMODR_ROOTMODEL
+#ifndef SIGMODRTREE_ROOTMODEL
+#define SIGMODRTREE_ROOTMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/RulesModel.h b/sigmodr/tree/RulesModel.h
index c0d8829f..350615e3 100644
--- a/sigmodr/tree/RulesModel.h
+++ b/sigmodr/tree/RulesModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_RULESMODEL
-#define SIGMODR_RULESMODEL
+#ifndef SIGMODRTREE_RULESMODEL
+#define SIGMODRTREE_RULESMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/SigmodModel.h b/sigmodr/tree/SigmodModel.h
index d466fbbf..e56e8953 100644
--- a/sigmodr/tree/SigmodModel.h
+++ b/sigmodr/tree/SigmodModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SIGMODMODEL
-#define SIGMODR_SIGMODMODEL
+#ifndef SIGMODRTREE_SIGMODMODEL
+#define SIGMODRTREE_SIGMODMODEL
 
 // Sigmodr tree includes
 #include "GroupObjectModel.h"
diff --git a/sigmodr/tree/SigmodrTree.h b/sigmodr/tree/SigmodrTree.h
index 4fc32ffd..d9ce47db 100644
--- a/sigmodr/tree/SigmodrTree.h
+++ b/sigmodr/tree/SigmodrTree.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SIGMODTREE
-#define SIGMODR_SIGMODTREE
+#ifndef SIGMODRTREE_SIGMODTREE
+#define SIGMODRTREE_SIGMODTREE
 
 // Sigmodr tree includes
 #include "Global.h"
diff --git a/sigmodr/tree/SigmodrTreeModel.h b/sigmodr/tree/SigmodrTreeModel.h
index f5918ee7..d6f846d8 100644
--- a/sigmodr/tree/SigmodrTreeModel.h
+++ b/sigmodr/tree/SigmodrTreeModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SIGMODTREEMODELMODEL
-#define SIGMODR_SIGMODTREEMODELMODEL
+#ifndef SIGMODRTREE_SIGMODTREEMODEL
+#define SIGMODRTREE_SIGMODTREEMODEL
 
 // Sigmodr tree includes
 #include "RootModel.h"
diff --git a/sigmodr/tree/SkinGroupModel.h b/sigmodr/tree/SkinGroupModel.h
index 353dcfdd..8b36d824 100644
--- a/sigmodr/tree/SkinGroupModel.h
+++ b/sigmodr/tree/SkinGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SKINGROUPMODEL
-#define SIGMODR_SKINGROUPMODEL
+#ifndef SIGMODRTREE_SKINGROUPMODEL
+#define SIGMODRTREE_SKINGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/SkinModel.h b/sigmodr/tree/SkinModel.h
index f834e8b5..6ae5208e 100644
--- a/sigmodr/tree/SkinModel.h
+++ b/sigmodr/tree/SkinModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SKINMODEL
-#define SIGMODR_SKINMODEL
+#ifndef SIGMODRTREE_SKINMODEL
+#define SIGMODRTREE_SKINMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/SoundGroupModel.h b/sigmodr/tree/SoundGroupModel.h
index 71433f4d..a9d0fc3c 100644
--- a/sigmodr/tree/SoundGroupModel.h
+++ b/sigmodr/tree/SoundGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SOUNDGROUPMODEL
-#define SIGMODR_SOUNDGROUPMODEL
+#ifndef SIGMODRTREE_SOUNDGROUPMODEL
+#define SIGMODRTREE_SOUNDGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/SoundModel.h b/sigmodr/tree/SoundModel.h
index 496ec061..57072aa3 100644
--- a/sigmodr/tree/SoundModel.h
+++ b/sigmodr/tree/SoundModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SOUNDMODEL
-#define SIGMODR_SOUNDMODEL
+#ifndef SIGMODRTREE_SOUNDMODEL
+#define SIGMODRTREE_SOUNDMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/SpeciesGroupModel.h b/sigmodr/tree/SpeciesGroupModel.h
index 9efcabc7..c577b68c 100644
--- a/sigmodr/tree/SpeciesGroupModel.h
+++ b/sigmodr/tree/SpeciesGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SPECIESGROUPMODEL
-#define SIGMODR_SPECIESGROUPMODEL
+#ifndef SIGMODRTREE_SPECIESGROUPMODEL
+#define SIGMODRTREE_SPECIESGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/SpeciesModel.h b/sigmodr/tree/SpeciesModel.h
index aa2ca03d..0c7f3780 100644
--- a/sigmodr/tree/SpeciesModel.h
+++ b/sigmodr/tree/SpeciesModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SPECIESMODEL
-#define SIGMODR_SPECIESMODEL
+#ifndef SIGMODRTREE_SPECIESMODEL
+#define SIGMODRTREE_SPECIESMODEL
 
 // Sigmodr tree includes
 #include "GroupObjectModel.h"
diff --git a/sigmodr/tree/SpeciesMoveModel.h b/sigmodr/tree/SpeciesMoveModel.h
index a4dba753..406e53ae 100644
--- a/sigmodr/tree/SpeciesMoveModel.h
+++ b/sigmodr/tree/SpeciesMoveModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SPECIESMOVEMODEL
-#define SIGMODR_SPECIESMOVEMODEL
+#ifndef SIGMODRTREE_SPECIESMOVEMODEL
+#define SIGMODRTREE_SPECIESMOVEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/SpriteGroupModel.h b/sigmodr/tree/SpriteGroupModel.h
index 73039315..977bdb15 100644
--- a/sigmodr/tree/SpriteGroupModel.h
+++ b/sigmodr/tree/SpriteGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SPRITEGROUPMODEL
-#define SIGMODR_SPRITEGROUPMODEL
+#ifndef SIGMODRTREE_SPRITEGROUPMODEL
+#define SIGMODRTREE_SPRITEGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/SpriteModel.h b/sigmodr/tree/SpriteModel.h
index dc724ae4..948a127f 100644
--- a/sigmodr/tree/SpriteModel.h
+++ b/sigmodr/tree/SpriteModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_SPRITEMODEL
-#define SIGMODR_SPRITEMODEL
+#ifndef SIGMODRTREE_SPRITEMODEL
+#define SIGMODRTREE_SPRITEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/StatusGroupModel.h b/sigmodr/tree/StatusGroupModel.h
index f67df0d9..d8338168 100644
--- a/sigmodr/tree/StatusGroupModel.h
+++ b/sigmodr/tree/StatusGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_STATUSGROUPMODEL
-#define SIGMODR_STATUSGROUPMODEL
+#ifndef SIGMODRTREE_STATUSGROUPMODEL
+#define SIGMODRTREE_STATUSGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/StatusModel.h b/sigmodr/tree/StatusModel.h
index eb5ab810..d6fe1583 100644
--- a/sigmodr/tree/StatusModel.h
+++ b/sigmodr/tree/StatusModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_STATUSMODEL
-#define SIGMODR_STATUSMODEL
+#ifndef SIGMODRTREE_STATUSMODEL
+#define SIGMODRTREE_STATUSMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/StoreGroupModel.h b/sigmodr/tree/StoreGroupModel.h
index a7e3b37e..2f2d88f6 100644
--- a/sigmodr/tree/StoreGroupModel.h
+++ b/sigmodr/tree/StoreGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_STOREGROUPMODEL
-#define SIGMODR_STOREGROUPMODEL
+#ifndef SIGMODRTREE_STOREGROUPMODEL
+#define SIGMODRTREE_STOREGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/StoreModel.h b/sigmodr/tree/StoreModel.h
index 6a426550..c46e536c 100644
--- a/sigmodr/tree/StoreModel.h
+++ b/sigmodr/tree/StoreModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_STOREMODEL
-#define SIGMODR_STOREMODEL
+#ifndef SIGMODRTREE_STOREMODEL
+#define SIGMODRTREE_STOREMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/TileGroupModel.h b/sigmodr/tree/TileGroupModel.h
index 3f876f5a..81465b07 100644
--- a/sigmodr/tree/TileGroupModel.h
+++ b/sigmodr/tree/TileGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TILEGROUPMODEL
-#define SIGMODR_TILEGROUPMODEL
+#ifndef SIGMODRTREE_TILEGROUPMODEL
+#define SIGMODRTREE_TILEGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/TileModel.h b/sigmodr/tree/TileModel.h
index 69a148d2..8d309cb3 100644
--- a/sigmodr/tree/TileModel.h
+++ b/sigmodr/tree/TileModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TILEMODEL
-#define SIGMODR_TILEMODEL
+#ifndef SIGMODRTREE_TILEMODEL
+#define SIGMODRTREE_TILEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/TimeGroupModel.h b/sigmodr/tree/TimeGroupModel.h
index 4ddcbd55..8503c6f9 100644
--- a/sigmodr/tree/TimeGroupModel.h
+++ b/sigmodr/tree/TimeGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TIMEGROUPMODEL
-#define SIGMODR_TIMEGROUPMODEL
+#ifndef SIGMODRTREE_TIMEGROUPMODEL
+#define SIGMODRTREE_TIMEGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/TimeModel.h b/sigmodr/tree/TimeModel.h
index 43bde9d1..6bebbc54 100644
--- a/sigmodr/tree/TimeModel.h
+++ b/sigmodr/tree/TimeModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TIMEMODEL
-#define SIGMODR_TIMEMODEL
+#ifndef SIGMODRTREE_TIMEMODEL
+#define SIGMODRTREE_TIMEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/TrainerGroupModel.h b/sigmodr/tree/TrainerGroupModel.h
index 8c07decf..e3a85187 100644
--- a/sigmodr/tree/TrainerGroupModel.h
+++ b/sigmodr/tree/TrainerGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TRAINERGROUPMODEL
-#define SIGMODR_TRAINERGROUPMODEL
+#ifndef SIGMODRTREE_TRAINERGROUPMODEL
+#define SIGMODRTREE_TRAINERGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/TrainerModel.h b/sigmodr/tree/TrainerModel.h
index 431c28bf..a7554113 100644
--- a/sigmodr/tree/TrainerModel.h
+++ b/sigmodr/tree/TrainerModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TRAINERMODEL
-#define SIGMODR_TRAINERMODEL
+#ifndef SIGMODRTREE_TRAINERMODEL
+#define SIGMODRTREE_TRAINERMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/TypeGroupModel.h b/sigmodr/tree/TypeGroupModel.h
index e091901b..4f91e371 100644
--- a/sigmodr/tree/TypeGroupModel.h
+++ b/sigmodr/tree/TypeGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TYPEGROUPMODEL
-#define SIGMODR_TYPEGROUPMODEL
+#ifndef SIGMODRTREE_TYPEGROUPMODEL
+#define SIGMODRTREE_TYPEGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/TypeModel.h b/sigmodr/tree/TypeModel.h
index 995c68c6..96ac5e08 100644
--- a/sigmodr/tree/TypeModel.h
+++ b/sigmodr/tree/TypeModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_TYPEMODEL
-#define SIGMODR_TYPEMODEL
+#ifndef SIGMODRTREE_TYPEMODEL
+#define SIGMODRTREE_TYPEMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"
diff --git a/sigmodr/tree/WeatherGroupModel.h b/sigmodr/tree/WeatherGroupModel.h
index 602cc4e6..0880fba6 100644
--- a/sigmodr/tree/WeatherGroupModel.h
+++ b/sigmodr/tree/WeatherGroupModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_WEATHERGROUPMODEL
-#define SIGMODR_WEATHERGROUPMODEL
+#ifndef SIGMODRTREE_WEATHERGROUPMODEL
+#define SIGMODRTREE_WEATHERGROUPMODEL
 
 // Sigmodr tree includes
 #include "GroupModel.h"
diff --git a/sigmodr/tree/WeatherModel.h b/sigmodr/tree/WeatherModel.h
index 2930fd28..eff3a904 100644
--- a/sigmodr/tree/WeatherModel.h
+++ b/sigmodr/tree/WeatherModel.h
@@ -15,8 +15,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGMODR_WEATHERMODEL
-#define SIGMODR_WEATHERMODEL
+#ifndef SIGMODRTREE_WEATHERMODEL
+#define SIGMODRTREE_WEATHERMODEL
 
 // Sigmodr tree includes
 #include "ObjectModel.h"