--- a/abbrev.stc	Mon Sep 29 23:57:00 2014 +0100
+++ b/abbrev.stc	Tue Sep 30 09:56:09 2014 +0100
@@ -15,7 +15,8 @@
 GDBPTY GDBPTY jv:libgdbs 'GDB-Private' 0
 GDBProcess GDBProcess jv:libgdbs 'GDB-Private' 0
 GDBSessionRecord GDBSessionRecord jv:libgdbs 'GDB-Private-Simulator' 0
-GDBThreadStatus GDBThreadStatus jv:libgdbs 'GDB-Core' 0
+GDBSimulatorResource GDBSimulatorResource jv:libgdbs 'GDB-Resources' 1
+GDBThreadState GDBThreadState jv:libgdbs 'GDB-Core' 0
 GDBTransientDataHolder GDBTransientDataHolder jv:libgdbs 'GDB-Private' 0
 jv_libgdbs jv_libgdbs jv:libgdbs '* Projects & Packages *' 3
 GDBAsyncEvent GDBAsyncEvent jv:libgdbs 'GDB-Core-Events' 0
@@ -33,9 +34,9 @@
 GDBSessionRecorder GDBSessionRecorder jv:libgdbs 'GDB-Private-Simulator' 0
 GDBSimulatorProcess GDBSimulatorProcess jv:libgdbs 'GDB-Private-Simulator' 0
 GDBStreamOutputEvent GDBStreamOutputEvent jv:libgdbs 'GDB-Core-Events' 0
-GDBThreadStatusRunning GDBThreadStatusRunning jv:libgdbs 'GDB-Core' 1
-GDBThreadStatusStopped GDBThreadStatusStopped jv:libgdbs 'GDB-Core' 0
-GDBThreadStatusTerminated GDBThreadStatusTerminated jv:libgdbs 'GDB-Core' 1
+GDBThreadStateRunning GDBThreadStateRunning jv:libgdbs 'GDB-Core' 1
+GDBThreadStateStopped GDBThreadStateStopped jv:libgdbs 'GDB-Core' 0
+GDBThreadStateTerminated GDBThreadStateTerminated jv:libgdbs 'GDB-Core' 1
 GDBUnixProcess GDBUnixProcess jv:libgdbs 'GDB-Private' 0
 GDBBreakpoint GDBBreakpoint jv:libgdbs 'GDB-Core' 0
 GDBConsoleOutputEvent GDBConsoleOutputEvent jv:libgdbs 'GDB-Core-Events' 0
@@ -178,4 +179,3 @@
 GDBThreadGroupAddedEvent GDBThreadGroupAddedEvent jv:libgdbs 'GDB-Core-Events' 0
 GDBThreadGroupExitedEvent GDBThreadGroupExitedEvent jv:libgdbs 'GDB-Core-Events' 0
 GDBThreadGroupStartedEvent GDBThreadGroupStartedEvent jv:libgdbs 'GDB-Core-Events' 0
-GDBSimulatorResource GDBSimulatorResource jv:libgdbs 'GDB-Resources' 1