diff --git a/docs/releases.txt b/docs/releases.txt
index 03045d13..b1540c26 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -9,6 +9,8 @@ FEATURE:	Added GFXSINGLEMAKE=yes|no to the ugfx makefile to compile ugfx as a si
 FEATURE:	New board STM32F746G-Discovery
 FEATURE:	New gdisp driver STM32LTDC
 FEATURE:	Better support for Raw32 platforms
+FEATURE:	Renaming GFX_NO_OS_INIT to GFX_OS_NO_INIT
+
 
 *** Release 2.3 ***
 FEATURE:	Added more events to the slider widget
diff --git a/gfx.h b/gfx.h
index 541743e5..2d073c0c 100644
--- a/gfx.h
+++ b/gfx.h
@@ -221,11 +221,11 @@ extern "C" {
 	 * @note	This will initialise each sub-system that has been turned on.
 	 * 			For example, if GFX_USE_GDISP is defined then display will be initialised
 	 * 			and cleared to black.
-	 * @note	If you define GFX_NO_OS_INIT as TRUE in your gfxconf.h file then ugfx doesn't try to
+	 * @note	If you define GFX_OS_NO_INIT as TRUE in your gfxconf.h file then ugfx doesn't try to
 	 * 			initialise the operating system for you when you call @p gfxInit().
 	 * @note	If you define GFX_OS_EXTRA_INIT_FUNCTION in your gfxconf.h file the macro is the
 	 * 			name of a void function with no parameters that is called immediately after
-	 * 			operating system initialisation (whether or not GFX_NO_OS_INIT is set).
+	 * 			operating system initialisation (whether or not GFX_OS_NO_INIT is set).
 	 * @note	If you define GFX_OS_EXTRA_DEINIT_FUNCTION in your gfxconf.h file the macro is the
 	 * 			name of a void function with no parameters that is called immediately before
 	 * 			operating system de-initialisation (as ugfx is exiting).
diff --git a/gfxconf.example.h b/gfxconf.example.h
index d46bbae2..27c55a2a 100644
--- a/gfxconf.example.h
+++ b/gfxconf.example.h
@@ -42,7 +42,7 @@
 //    #define GFX_COMPILER                             GFX_COMPILER_UNKNOWN
 //    #define GFX_CPU                                  GFX_CPU_UNKNOWN
 //    #define GFX_OS_HEAP_SIZE                         0
-//    #define GFX_NO_OS_INIT                           FALSE
+//    #define GFX_OS_NO_INIT                           FALSE
 //    #define GFX_OS_INIT_NO_WARNING                   FALSE
 //    #define GFX_OS_EXTRA_INIT_FUNCTION               myOSInitRoutine
 //    #define GFX_OS_EXTRA_DEINIT_FUNCTION             myOSDeInitRoutine
diff --git a/src/gos/gos_chibios.c b/src/gos/gos_chibios.c
index 4c79bd3d..eb839dc6 100644
--- a/src/gos/gos_chibios.c
+++ b/src/gos/gos_chibios.c
@@ -35,7 +35,7 @@
 
 void _gosInit(void)
 {
-	#if !GFX_NO_OS_INIT
+	#if !GFX_OS_NO_INIT
 		/* Don't Initialize if the user already has */
 		#if CH_KERNEL_MAJOR == 2
 			if (!chThdSelf()) {
diff --git a/src/gos/gos_ecos.c b/src/gos/gos_ecos.c
index cdad86da..b3476b22 100644
--- a/src/gos/gos_ecos.c
+++ b/src/gos/gos_ecos.c
@@ -11,8 +11,8 @@
 
 void _gosInit(void)
 {
-	#if !GFX_NO_OS_INIT
-		#error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h"
+	#if !GFX_OS_NO_INIT
+		#error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
 	#endif
 	#if !GFX_OS_INIT_NO_WARNING
 		#warning "GOS: Operating System initialization has been turned off. Make sure you call cyg_scheduler_start() before gfxInit() in your application!"
diff --git a/src/gos/gos_freertos.c b/src/gos/gos_freertos.c
index 7b978738..227caf31 100644
--- a/src/gos/gos_freertos.c
+++ b/src/gos/gos_freertos.c
@@ -24,8 +24,8 @@
 
 void _gosInit(void)
 {
-	#if !GFX_NO_OS_INIT
-		#error "GOS: Operating System initialization for FreeRTOS is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h"
+	#if !GFX_OS_NO_INIT
+		#error "GOS: Operating System initialization for FreeRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
 	#endif
 	#if !GFX_OS_INIT_NO_WARNING
 		#warning "GOS: Operating System initialization has been turned off. Make sure you call vTaskStartScheduler() before gfxInit() in your application!"
diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h
index 600c3085..c80a9f39 100644
--- a/src/gos/gos_options.h
+++ b/src/gos/gos_options.h
@@ -128,8 +128,8 @@
  	 * 			system in your application code. Note that on these operating systems the
  	 * 			demo applications will not work without modification.
  	 */
- 	#ifndef GFX_NO_OS_INIT
- 		#define GFX_NO_OS_INIT			FALSE
+ 	#ifndef GFX_OS_NO_INIT
+ 		#define GFX_OS_NO_INIT			FALSE
  	#endif
  	/**
  	 * @brief	Turn off warnings about initializing the operating system
diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c
index 8efe2235..a33c49b3 100644
--- a/src/gos/gos_rawrtos.c
+++ b/src/gos/gos_rawrtos.c
@@ -24,8 +24,8 @@
 
 void _gosInit(void)
 {
-	#if !GFX_NO_OS_INIT
-		#error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h"
+	#if !GFX_OS_NO_INIT
+		#error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
 	#endif
 	#if !GFX_OS_INIT_NO_WARNING
 		#warning "GOS: Operating System initialization has been turned off. Make sure you call raw_os_start() before gfxInit() in your application!"