diff --git a/.gitignore b/.gitignore
index 0bdf71a..fcdc6e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,10 +8,10 @@
 /src/qemu-git/libhw64
 /src/qemu-git/config-host.*
 /src/qemu-git/config-all-devices.mak
-/dist/x49gpng
+/dist/x50ng
 /dist/sdcard
-/dist/x49gpng.desktop
-/dist/x49gpng.man
+/dist/x50ng.desktop
+/dist/x50ng.man
 /dist/firmware/*.zip
 /dist/firmware/Readme.txt
 /dist/firmware/boot-*.bin
diff --git a/Makefile b/Makefile
index 23864c1..c711a68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-TARGET = x49gpng
-TARGET_ALLCAPS = X49GPNG
+TARGET = x50ng
+TARGET_ALLCAPS = X50NG
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 4
@@ -88,8 +88,8 @@ X49GP_DEBUG = \
 	-DDEBUG_X49GP_MAIN \
 	-DDEBUG_X49GP_UI
 
-X49GP_INCLUDES = -I./src/x49gpng/ \
-	-I./src/x49gpng/bitmaps/ \
+X49GP_INCLUDES = -I./src/x50ng/ \
+	-I./src/x50ng/bitmaps/ \
 	-I./src/qemu-git/ \
 	$(QEMU_INCLUDES)
 
@@ -116,39 +116,39 @@ endif
 X49GP_LDFLAGS = $(DEBUG_CFLAGS) $(LDFLAGS)
 X49GP_LDLIBS = $(QEMU_OBJS) $(GDB_LIBS) $(COCOA_LIBS) $(GTK_LDLIBS) $(LUALIBS)
 
-SRCS = ./src/x49gpng/main.c \
-	./src/x49gpng/module.c \
-	./src/x49gpng/flash.c \
-	./src/x49gpng/sram.c \
-	./src/x49gpng/s3c2410.c \
-	./src/x49gpng/s3c2410_sram.c \
-	./src/x49gpng/s3c2410_memc.c \
-	./src/x49gpng/s3c2410_intc.c \
-	./src/x49gpng/s3c2410_power.c \
-	./src/x49gpng/s3c2410_lcd.c \
-	./src/x49gpng/s3c2410_nand.c \
-	./src/x49gpng/s3c2410_uart.c \
-	./src/x49gpng/s3c2410_timer.c \
-	./src/x49gpng/s3c2410_usbdev.c \
-	./src/x49gpng/s3c2410_watchdog.c \
-	./src/x49gpng/s3c2410_io_port.c \
-	./src/x49gpng/s3c2410_rtc.c \
-	./src/x49gpng/s3c2410_adc.c \
-	./src/x49gpng/s3c2410_spi.c \
-	./src/x49gpng/s3c2410_sdi.c \
-	./src/x49gpng/s3c2410_arm.c \
-	./src/x49gpng/ui.c \
-	./src/x49gpng/timer.c \
-	./src/x49gpng/gdbstub.c \
-	./src/x49gpng/block.c \
-	./src/x49gpng/options.c
+SRCS = ./src/x50ng/main.c \
+	./src/x50ng/module.c \
+	./src/x50ng/flash.c \
+	./src/x50ng/sram.c \
+	./src/x50ng/s3c2410.c \
+	./src/x50ng/s3c2410_sram.c \
+	./src/x50ng/s3c2410_memc.c \
+	./src/x50ng/s3c2410_intc.c \
+	./src/x50ng/s3c2410_power.c \
+	./src/x50ng/s3c2410_lcd.c \
+	./src/x50ng/s3c2410_nand.c \
+	./src/x50ng/s3c2410_uart.c \
+	./src/x50ng/s3c2410_timer.c \
+	./src/x50ng/s3c2410_usbdev.c \
+	./src/x50ng/s3c2410_watchdog.c \
+	./src/x50ng/s3c2410_io_port.c \
+	./src/x50ng/s3c2410_rtc.c \
+	./src/x50ng/s3c2410_adc.c \
+	./src/x50ng/s3c2410_spi.c \
+	./src/x50ng/s3c2410_sdi.c \
+	./src/x50ng/s3c2410_arm.c \
+	./src/x50ng/ui.c \
+	./src/x50ng/timer.c \
+	./src/x50ng/gdbstub.c \
+	./src/x50ng/block.c \
+	./src/x50ng/options.c
 
 OBJS = $(SRCS:.c=.o)
 
 # TEMPO hack
-VVFATOBJS = ./src/x49gpng/block-vvfat.o \
-	./src/x49gpng/block-qcow.o \
-	./src/x49gpng/block-raw.o \
+VVFATOBJS = ./src/x50ng/block-vvfat.o \
+	./src/x50ng/block-qcow.o \
+	./src/x50ng/block-raw.o \
 	$(QEMU_DIR)/cutils.o
 
 all: do-it-all
@@ -167,7 +167,7 @@ dist/$(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU_OBJS)
 %.o: %.c
 	$(CC) $(X49GP_CFLAGS) -o $@ -c $<
 
-./src/x49gpng/block-vvfat.o: ./src/x49gpng/block-vvfat.c
+./src/x50ng/block-vvfat.o: ./src/x50ng/block-vvfat.c
 	$(CC) $(X49GP_CFLAGS) -fno-aggressive-loop-optimizations -o $@ -c $<
 
 # Compilation of qemu-git
@@ -197,7 +197,7 @@ depend: depend-libs
 
 # Cleaning
 clean:
-	rm -f ./src/x49gpng/*.o core *~ .depend
+	rm -f ./src/x50ng/*.o core *~ .depend
 
 distclean: clean clean-qemu
 	rm -f dist/$(TARGET) dist/$(TARGET).desktop dist/$(TARGET).man
@@ -207,7 +207,7 @@ mrproper: distclean
 
 # auto-format code
 pretty-code:
-	clang-format -i ./src/x49gpng/*.c $(shell ls ./src/x49gpng/*.h | grep -v s3c2410.h) ## s3c2410.h triggers an error
+	clang-format -i ./src/x50ng/*.c $(shell ls ./src/x50ng/*.h | grep -v s3c2410.h) ## s3c2410.h triggers an error
 
 # Populate dist/firmware/ from hpcalc.org
 pull-firmware:
diff --git a/dist/x49gpng.desktop.in b/dist/x50ng.desktop.in
similarity index 100%
rename from dist/x49gpng.desktop.in
rename to dist/x50ng.desktop.in
diff --git a/dist/x49gpng.scd b/dist/x50ng.scd
similarity index 100%
rename from dist/x49gpng.scd
rename to dist/x50ng.scd
diff --git a/src/x49gpng/block-qcow.c b/src/x50ng/block-qcow.c
similarity index 100%
rename from src/x49gpng/block-qcow.c
rename to src/x50ng/block-qcow.c
diff --git a/src/x49gpng/block-raw.c b/src/x50ng/block-raw.c
similarity index 100%
rename from src/x49gpng/block-raw.c
rename to src/x50ng/block-raw.c
diff --git a/src/x49gpng/block-vvfat.c b/src/x50ng/block-vvfat.c
similarity index 100%
rename from src/x49gpng/block-vvfat.c
rename to src/x50ng/block-vvfat.c
diff --git a/src/x49gpng/block.c b/src/x50ng/block.c
similarity index 100%
rename from src/x49gpng/block.c
rename to src/x50ng/block.c
diff --git a/src/x49gpng/block.h b/src/x50ng/block.h
similarity index 100%
rename from src/x49gpng/block.h
rename to src/x50ng/block.h
diff --git a/src/x49gpng/block_int.h b/src/x50ng/block_int.h
similarity index 100%
rename from src/x49gpng/block_int.h
rename to src/x50ng/block_int.h
diff --git a/src/x49gpng/byteorder.h b/src/x50ng/byteorder.h
similarity index 100%
rename from src/x49gpng/byteorder.h
rename to src/x50ng/byteorder.h
diff --git a/src/x49gpng/flash.c b/src/x50ng/flash.c
similarity index 100%
rename from src/x49gpng/flash.c
rename to src/x50ng/flash.c
diff --git a/src/x49gpng/gdbstub.c b/src/x50ng/gdbstub.c
similarity index 100%
rename from src/x49gpng/gdbstub.c
rename to src/x50ng/gdbstub.c
diff --git a/src/x49gpng/gdbstub.h b/src/x50ng/gdbstub.h
similarity index 100%
rename from src/x49gpng/gdbstub.h
rename to src/x50ng/gdbstub.h
diff --git a/src/x49gpng/hex2bin.c b/src/x50ng/hex2bin.c
similarity index 100%
rename from src/x49gpng/hex2bin.c
rename to src/x50ng/hex2bin.c
diff --git a/src/x49gpng/le32hex2bin.c b/src/x50ng/le32hex2bin.c
similarity index 100%
rename from src/x49gpng/le32hex2bin.c
rename to src/x50ng/le32hex2bin.c
diff --git a/src/x49gpng/list.h b/src/x50ng/list.h
similarity index 100%
rename from src/x49gpng/list.h
rename to src/x50ng/list.h
diff --git a/src/x49gpng/main.c b/src/x50ng/main.c
similarity index 100%
rename from src/x49gpng/main.c
rename to src/x50ng/main.c
diff --git a/src/x49gpng/module.c b/src/x50ng/module.c
similarity index 100%
rename from src/x49gpng/module.c
rename to src/x50ng/module.c
diff --git a/src/x49gpng/options.c b/src/x50ng/options.c
similarity index 98%
rename from src/x49gpng/options.c
rename to src/x50ng/options.c
index f7b9453..6da251c 100644
--- a/src/x49gpng/options.c
+++ b/src/x50ng/options.c
@@ -93,7 +93,7 @@ static inline bool config_read( const char* filename )
 static void print_config( void )
 {
     fprintf( stdout, "--------------------------------------------------------------------------------\n" );
-    fprintf( stdout, "-- Configuration file for x49gpng\n" );
+    fprintf( stdout, "-- Configuration file for x50ng\n" );
     fprintf( stdout, "-- This is a comment\n" );
 
     fprintf( stdout, "name = \"%s\" -- this customize the title of the window\n", opt.name );
@@ -108,7 +108,7 @@ static void print_config( void )
 
     fprintf( stdout, "verbose = %s\n", opt.verbose ? "true" : "false" );
 
-    fprintf( stdout, "--- End of x49gpng configuration -----------------------------------------------\n" );
+    fprintf( stdout, "--- End of x50ng configuration -----------------------------------------------\n" );
 }
 
 void config_init( char* progname, int argc, char* argv[] )
diff --git a/src/x49gpng/options.h b/src/x50ng/options.h
similarity index 88%
rename from src/x49gpng/options.h
rename to src/x50ng/options.h
index 45556f4..0b3b0b3 100644
--- a/src/x49gpng/options.h
+++ b/src/x50ng/options.h
@@ -15,7 +15,7 @@
 #  define PATCHLEVEL 0
 #endif
 
-typedef enum { MODEL_49GP = 0, MODEL_50G } x49gpng_model_t;
+typedef enum { MODEL_49GP = 0, MODEL_50G } x50ng_model_t;
 
 struct options {
     char* state_filename;
@@ -24,7 +24,7 @@ struct options {
     char* firmware;
     x49gp_reinit_t reinit;
 
-    x49gpng_model_t model;
+    x50ng_model_t model;
     bool newrpl;
     char* name;
 
diff --git a/src/x49gpng/s3c2410.c b/src/x50ng/s3c2410.c
similarity index 100%
rename from src/x49gpng/s3c2410.c
rename to src/x50ng/s3c2410.c
diff --git a/src/x49gpng/s3c2410.h b/src/x50ng/s3c2410.h
similarity index 100%
rename from src/x49gpng/s3c2410.h
rename to src/x50ng/s3c2410.h
diff --git a/src/x49gpng/s3c2410_adc.c b/src/x50ng/s3c2410_adc.c
similarity index 100%
rename from src/x49gpng/s3c2410_adc.c
rename to src/x50ng/s3c2410_adc.c
diff --git a/src/x49gpng/s3c2410_arm.c b/src/x50ng/s3c2410_arm.c
similarity index 100%
rename from src/x49gpng/s3c2410_arm.c
rename to src/x50ng/s3c2410_arm.c
diff --git a/src/x49gpng/s3c2410_intc.c b/src/x50ng/s3c2410_intc.c
similarity index 100%
rename from src/x49gpng/s3c2410_intc.c
rename to src/x50ng/s3c2410_intc.c
diff --git a/src/x49gpng/s3c2410_intc.h b/src/x50ng/s3c2410_intc.h
similarity index 100%
rename from src/x49gpng/s3c2410_intc.h
rename to src/x50ng/s3c2410_intc.h
diff --git a/src/x49gpng/s3c2410_io_port.c b/src/x50ng/s3c2410_io_port.c
similarity index 100%
rename from src/x49gpng/s3c2410_io_port.c
rename to src/x50ng/s3c2410_io_port.c
diff --git a/src/x49gpng/s3c2410_lcd.c b/src/x50ng/s3c2410_lcd.c
similarity index 100%
rename from src/x49gpng/s3c2410_lcd.c
rename to src/x50ng/s3c2410_lcd.c
diff --git a/src/x49gpng/s3c2410_memc.c b/src/x50ng/s3c2410_memc.c
similarity index 100%
rename from src/x49gpng/s3c2410_memc.c
rename to src/x50ng/s3c2410_memc.c
diff --git a/src/x49gpng/s3c2410_mmu.h b/src/x50ng/s3c2410_mmu.h
similarity index 100%
rename from src/x49gpng/s3c2410_mmu.h
rename to src/x50ng/s3c2410_mmu.h
diff --git a/src/x49gpng/s3c2410_nand.c b/src/x50ng/s3c2410_nand.c
similarity index 100%
rename from src/x49gpng/s3c2410_nand.c
rename to src/x50ng/s3c2410_nand.c
diff --git a/src/x49gpng/s3c2410_power.c b/src/x50ng/s3c2410_power.c
similarity index 100%
rename from src/x49gpng/s3c2410_power.c
rename to src/x50ng/s3c2410_power.c
diff --git a/src/x49gpng/s3c2410_power.h b/src/x50ng/s3c2410_power.h
similarity index 100%
rename from src/x49gpng/s3c2410_power.h
rename to src/x50ng/s3c2410_power.h
diff --git a/src/x49gpng/s3c2410_rtc.c b/src/x50ng/s3c2410_rtc.c
similarity index 100%
rename from src/x49gpng/s3c2410_rtc.c
rename to src/x50ng/s3c2410_rtc.c
diff --git a/src/x49gpng/s3c2410_sdi.c b/src/x50ng/s3c2410_sdi.c
similarity index 100%
rename from src/x49gpng/s3c2410_sdi.c
rename to src/x50ng/s3c2410_sdi.c
diff --git a/src/x49gpng/s3c2410_spi.c b/src/x50ng/s3c2410_spi.c
similarity index 100%
rename from src/x49gpng/s3c2410_spi.c
rename to src/x50ng/s3c2410_spi.c
diff --git a/src/x49gpng/s3c2410_sram.c b/src/x50ng/s3c2410_sram.c
similarity index 100%
rename from src/x49gpng/s3c2410_sram.c
rename to src/x50ng/s3c2410_sram.c
diff --git a/src/x49gpng/s3c2410_timer.c b/src/x50ng/s3c2410_timer.c
similarity index 100%
rename from src/x49gpng/s3c2410_timer.c
rename to src/x50ng/s3c2410_timer.c
diff --git a/src/x49gpng/s3c2410_timer.h b/src/x50ng/s3c2410_timer.h
similarity index 100%
rename from src/x49gpng/s3c2410_timer.h
rename to src/x50ng/s3c2410_timer.h
diff --git a/src/x49gpng/s3c2410_uart.c b/src/x50ng/s3c2410_uart.c
similarity index 100%
rename from src/x49gpng/s3c2410_uart.c
rename to src/x50ng/s3c2410_uart.c
diff --git a/src/x49gpng/s3c2410_usbdev.c b/src/x50ng/s3c2410_usbdev.c
similarity index 100%
rename from src/x49gpng/s3c2410_usbdev.c
rename to src/x50ng/s3c2410_usbdev.c
diff --git a/src/x49gpng/s3c2410_watchdog.c b/src/x50ng/s3c2410_watchdog.c
similarity index 100%
rename from src/x49gpng/s3c2410_watchdog.c
rename to src/x50ng/s3c2410_watchdog.c
diff --git a/src/x49gpng/saturn.h b/src/x50ng/saturn.h
similarity index 100%
rename from src/x49gpng/saturn.h
rename to src/x50ng/saturn.h
diff --git a/src/x49gpng/sram.c b/src/x50ng/sram.c
similarity index 100%
rename from src/x49gpng/sram.c
rename to src/x50ng/sram.c
diff --git a/src/x49gpng/timer.c b/src/x50ng/timer.c
similarity index 100%
rename from src/x49gpng/timer.c
rename to src/x50ng/timer.c
diff --git a/src/x49gpng/ui.c b/src/x50ng/ui.c
similarity index 99%
rename from src/x49gpng/ui.c
rename to src/x50ng/ui.c
index f0212ba..c2c3d07 100644
--- a/src/x49gpng/ui.c
+++ b/src/x50ng/ui.c
@@ -693,15 +693,15 @@ char* css_global = "window {"
 /* functions */
 /*************/
 
-static inline void x49gpng_set_key_state( x49gp_t* x49gp, const x49gp_ui_key_t* key, bool state )
+static inline void x50ng_set_key_state( x49gp_t* x49gp, const x49gp_ui_key_t* key, bool state )
 {
     if ( key->rowbit )
         s3c2410_io_port_g_update( x49gp, key->column, key->row, key->columnbit, key->rowbit, state );
     else
         s3c2410_io_port_f_set_bit( x49gp, key->eint, state );
 }
-#define X49GPNG_PRESS_KEY( x49gp, key ) x49gpng_set_key_state( x49gp, key, true )
-#define X49GPNG_RELEASE_KEY( x49gp, key ) x49gpng_set_key_state( x49gp, key, false )
+#define X49GPNG_PRESS_KEY( x49gp, key ) x50ng_set_key_state( x49gp, key, true )
+#define X49GPNG_RELEASE_KEY( x49gp, key ) x50ng_set_key_state( x49gp, key, false )
 
 static void ui_release_button( x49gp_ui_button_t* button )
 {
diff --git a/src/x49gpng/ui.h b/src/x50ng/ui.h
similarity index 100%
rename from src/x49gpng/ui.h
rename to src/x50ng/ui.h
diff --git a/src/x49gpng/x49gp.h b/src/x50ng/x49gp.h
similarity index 100%
rename from src/x49gpng/x49gp.h
rename to src/x50ng/x49gp.h
diff --git a/src/x49gpng/x49gp_timer.h b/src/x50ng/x49gp_timer.h
similarity index 100%
rename from src/x49gpng/x49gp_timer.h
rename to src/x50ng/x49gp_timer.h
diff --git a/src/x49gpng/x49gp_types.h b/src/x50ng/x49gp_types.h
similarity index 100%
rename from src/x49gpng/x49gp_types.h
rename to src/x50ng/x49gp_types.h