diff --git a/spine-c/spine-c.vcxproj b/spine-c/spine-c.vcxproj
index c393bf8c0..97aee194f 100644
--- a/spine-c/spine-c.vcxproj
+++ b/spine-c/spine-c.vcxproj
@@ -71,53 +71,53 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="include\spine\spAnimation.h" />
-    <ClInclude Include="include\spine\spAnimationState.h" />
-    <ClInclude Include="include\spine\spAnimationStateData.h" />
+    <ClInclude Include="include\spine\Animation.h" />
+    <ClInclude Include="include\spine\AnimationState.h" />
+    <ClInclude Include="include\spine\AnimationStateData.h" />
     <ClInclude Include="include\spine\Atlas.h" />
-    <ClInclude Include="include\spine\spAtlasAttachmentLoader.h" />
+    <ClInclude Include="include\spine\AtlasAttachmentLoader.h" />
     <ClInclude Include="include\spine\Attachment.h" />
-    <ClInclude Include="include\spine\spAttachmentLoader.h" />
-    <ClInclude Include="include\spine\spBone.h" />
-    <ClInclude Include="include\spine\spBoneData.h" />
-    <ClInclude Include="include\spine\spBoundingBoxAttachment.h" />
-    <ClInclude Include="include\spine\spEvent.h" />
-    <ClInclude Include="include\spine\spEventData.h" />
+    <ClInclude Include="include\spine\AttachmentLoader.h" />
+    <ClInclude Include="include\spine\Bone.h" />
+    <ClInclude Include="include\spine\BoneData.h" />
+    <ClInclude Include="include\spine\BoundingBoxAttachment.h" />
+    <ClInclude Include="include\spine\Event.h" />
+    <ClInclude Include="include\spine\EventData.h" />
     <ClInclude Include="include\spine\extension.h" />
-    <ClInclude Include="include\spine\spRegionAttachment.h" />
+    <ClInclude Include="include\spine\RegionAttachment.h" />
     <ClInclude Include="include\spine\Skeleton.h" />
-    <ClInclude Include="include\spine\spSkeletonBounds.h" />
-    <ClInclude Include="include\spine\spSkeletonData.h" />
-    <ClInclude Include="include\spine\spSkeletonJson.h" />
-    <ClInclude Include="include\spine\spSkin.h" />
-    <ClInclude Include="include\spine\spSlot.h" />
-    <ClInclude Include="include\spine\spSlotData.h" />
-    <ClInclude Include="include\spine\spine.h" />
+    <ClInclude Include="include\spine\SkeletonBounds.h" />
+    <ClInclude Include="include\spine\SkeletonData.h" />
+    <ClInclude Include="include\spine\SkeletonJson.h" />
+    <ClInclude Include="include\spine\Skin.h" />
+    <ClInclude Include="include\spine\Slot.h" />
+    <ClInclude Include="include\spine\SlotData.h" />
+    <ClInclude Include="include\spine\ine.h" />
     <ClInclude Include="src\spine\Json.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\spine\spAnimation.c" />
-    <ClCompile Include="src\spine\spAnimationState.c" />
-    <ClCompile Include="src\spine\spAnimationStateData.c" />
+    <ClCompile Include="src\spine\Animation.c" />
+    <ClCompile Include="src\spine\AnimationState.c" />
+    <ClCompile Include="src\spine\AnimationStateData.c" />
     <ClCompile Include="src\spine\Atlas.c" />
-    <ClCompile Include="src\spine\AtlasspAttachmentLoader.c" />
+    <ClCompile Include="src\spine\AtlasAttachmentLoader.c" />
     <ClCompile Include="src\spine\Attachment.c" />
-    <ClCompile Include="src\spine\spAttachmentLoader.c" />
-    <ClCompile Include="src\spine\spBone.c" />
-    <ClCompile Include="src\spine\spBoneData.c" />
-    <ClCompile Include="src\spine\spBoundingBoxAttachment.c" />
-    <ClCompile Include="src\spine\spEvent.c" />
-    <ClCompile Include="src\spine\spEventData.c" />
+    <ClCompile Include="src\spine\AttachmentLoader.c" />
+    <ClCompile Include="src\spine\Bone.c" />
+    <ClCompile Include="src\spine\BoneData.c" />
+    <ClCompile Include="src\spine\BoundingBoxAttachment.c" />
+    <ClCompile Include="src\spine\Event.c" />
+    <ClCompile Include="src\spine\EventData.c" />
     <ClCompile Include="src\spine\extension.c" />
     <ClCompile Include="src\spine\Json.c" />
-    <ClCompile Include="src\spine\spRegionAttachment.c" />
+    <ClCompile Include="src\spine\RegionAttachment.c" />
     <ClCompile Include="src\spine\Skeleton.c" />
-    <ClCompile Include="src\spine\spSkeletonBounds.c" />
-    <ClCompile Include="src\spine\spSkeletonData.c" />
-    <ClCompile Include="src\spine\spSkeletonJson.c" />
-    <ClCompile Include="src\spine\spSkin.c" />
-    <ClCompile Include="src\spine\spSlot.c" />
-    <ClCompile Include="src\spine\spSlotData.c" />
+    <ClCompile Include="src\spine\SkeletonBounds.c" />
+    <ClCompile Include="src\spine\SkeletonData.c" />
+    <ClCompile Include="src\spine\SkeletonJson.c" />
+    <ClCompile Include="src\spine\Skin.c" />
+    <ClCompile Include="src\spine\Slot.c" />
+    <ClCompile Include="src\spine\SlotData.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/spine-c/spine-c.vcxproj.filters b/spine-c/spine-c.vcxproj.filters
index 178cbbf8f..ecd0cea5b 100644
--- a/spine-c/spine-c.vcxproj.filters
+++ b/spine-c/spine-c.vcxproj.filters
@@ -15,141 +15,141 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\spine\spAnimation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spAnimationState.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spAnimationStateData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\spine\Atlas.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spAtlasAttachmentLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\spine\Attachment.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spAttachmentLoader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spBone.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spBoneData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\spine\extension.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spRegionAttachment.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\spine\Skeleton.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spSkeletonData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spSkeletonJson.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spSkin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spSlot.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spSlotData.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\spine\spine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\spine\Json.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spBoundingBoxAttachment.h">
+    <ClInclude Include="include\spine\Animation.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spSkeletonBounds.h">
+    <ClInclude Include="include\spine\AnimationState.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spEvent.h">
+    <ClInclude Include="include\spine\AnimationStateData.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\spine\spEventData.h">
+    <ClInclude Include="include\spine\AtlasAttachmentLoader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\AttachmentLoader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\Bone.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\BoneData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\BoundingBoxAttachment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\EventData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\RegionAttachment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\SkeletonBounds.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\SkeletonData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\SkeletonJson.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\Skin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\Slot.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\SlotData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\spine\ine.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\spine\spAnimation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\spine\spAnimationState.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\spine\spAnimationStateData.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\spine\Atlas.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spAtlasAttachmentLoader.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\spine\Attachment.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spAttachmentLoader.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\spine\spBone.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\spine\spBoneData.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\spine\extension.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\spine\Json.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spRegionAttachment.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\spine\Skeleton.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spSkeletonData.c">
+    <ClCompile Include="src\spine\Animation.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spSkeletonJson.c">
+    <ClCompile Include="src\spine\AnimationState.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spSkin.c">
+    <ClCompile Include="src\spine\AnimationStateData.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spSlot.c">
+    <ClCompile Include="src\spine\AttachmentLoader.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spSlotData.c">
+    <ClCompile Include="src\spine\Bone.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spBoundingBoxAttachment.c">
+    <ClCompile Include="src\spine\BoneData.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spSkeletonBounds.c">
+    <ClCompile Include="src\spine\BoundingBoxAttachment.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spEventData.c">
+    <ClCompile Include="src\spine\Event.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\spine\spEvent.c">
+    <ClCompile Include="src\spine\EventData.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\RegionAttachment.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\SkeletonBounds.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\SkeletonData.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\SkeletonJson.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\Skin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\Slot.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\SlotData.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\spine\AtlasAttachmentLoader.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/spine-c/src/spine/Animation.c b/spine-c/src/spine/Animation.c
index a3c0a8ea4..e93ab7249 100644
--- a/spine-c/src/spine/Animation.c
+++ b/spine-c/src/spine/Animation.c
@@ -516,9 +516,9 @@ void spAttachmentTimeline_setFrame (spAttachmentTimeline* self, int frameIndex,
 
 void _spEventTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time, spEvent** firedEvents,
 		int* eventCount, float alpha) {
-	if (!firedEvents) return;
 	spEventTimeline* self = (spEventTimeline*)timeline;
 	int frameIndex;
+	if (!firedEvents) return;
 
 	if (lastTime >= self->frames[self->framesLength - 1]) return; /* Last time is after last frame. */