diff --git a/README.md b/README.md
index c2050c4..fec4c0f 100644
--- a/README.md
+++ b/README.md
@@ -46,10 +46,10 @@ Start up X11 and use xterm
 
 ------------------------------------------------------------------------
 
-Download x49gpng source:
+Download x50ng source:
 
 ```
-git clone https://github.com/gwenhael-le-moine/x49gpng.git
+git clone https://github.com/gwenhael-le-moine/x50ng.git
 ```
 
 ------------------------------------------------------------------------
@@ -57,7 +57,7 @@ git clone https://github.com/gwenhael-le-moine/x49gpng.git
 Build:
 
 ```
-cd x49gpng
+cd x50ng
 make
 ```
 
@@ -74,14 +74,14 @@ make install
 Run:
 
 ```
-./dist/x49gpng
+./dist/x50ng
 ```
 
-When installed, there should be an applications menu entry to run x49gpng.
+When installed, there should be an applications menu entry to run x50ng.
 Installing also enables running it from the terminal in any directory:
 
 ```
-x49gpng
+x50ng
 ```
 
 ------------------------------------------------------------------------
@@ -92,7 +92,7 @@ On the first launch, the calculator will be missing a firmware, forcing
 the bootloader to complain and demand a fresh one.
 HP's official firmwares can be found at e.g.:
 https://www.hpcalc.org/hp49/pc/rom/
-Some of the most popular of these are also included in x49gpng's source
+Some of the most popular of these are also included in x50ng's source
 directory.
 Alternatively, the most up-to-date version of NewRPL can be found at:
 https://hpgcc3.org/downloads/newrplfw.bin
@@ -161,22 +161,22 @@ Start Over:
 * clean slate?
 
 ```
-rm -r ~/.config/x49gpng/
+rm -r ~/.config/x50ng/
 ```
 
 * soft reset only?
 
-With x49gpng running, press F12, or right click on the screen and select
+With x50ng running, press F12, or right click on the screen and select
 "Reset" from the menu.
 
 ------------------------------------------------------------------------
 
-Debugging with x49gpng
+Debugging with x50ng
 
 There is a GDB interface for debugging ARM programs, e.g. HPGCC2/3
-applications or replacement firmwares. To use it, start x49gpng from a
+applications or replacement firmwares. To use it, start x50ng from a
 terminal with the -d option, and start arm-none-eabi-gdb with an
-appropriate ELF file in another terminal. To connect to x49gpng, type in
+appropriate ELF file in another terminal. To connect to x50ng, type in
 the GDB console:
 
 ```
diff --git a/src/x50ng/ui.c b/src/x50ng/ui.c
index c2c3d07..b597ad4 100644
--- a/src/x50ng/ui.c
+++ b/src/x50ng/ui.c
@@ -700,8 +700,8 @@ static inline void x50ng_set_key_state( x49gp_t* x49gp, const x49gp_ui_key_t* ke
     else
         s3c2410_io_port_f_set_bit( x49gp, key->eint, state );
 }
-#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 )
+#define X50NG_PRESS_KEY( x49gp, key ) x50ng_set_key_state( x49gp, key, true )
+#define X50NG_RELEASE_KEY( x49gp, key ) x50ng_set_key_state( x49gp, key, false )
 
 static void ui_release_button( x49gp_ui_button_t* button )
 {
@@ -720,7 +720,7 @@ static void ui_release_button( x49gp_ui_button_t* button )
     gtk_style_context_remove_class( gtk_widget_get_style_context( button->button ), "key-down" );
 #endif
 
-    X49GPNG_RELEASE_KEY( x49gp, key );
+    X50NG_RELEASE_KEY( x49gp, key );
 }
 
 static bool ui_press_button( x49gp_ui_button_t* button, bool hold )
@@ -745,7 +745,7 @@ static bool ui_press_button( x49gp_ui_button_t* button, bool hold )
     gtk_style_context_add_class( gtk_widget_get_style_context( button->button ), "key-down" );
 #endif
 
-    X49GPNG_RELEASE_KEY( x49gp, key );
+    X50NG_RELEASE_KEY( x49gp, key );
 
     return GDK_EVENT_STOP;
 }
@@ -762,7 +762,7 @@ static bool react_to_button_press( GtkWidget* widget, GdkEventButton* event, gpo
     if ( !ui_press_button( button, event->button == 3 ) )
         return GDK_EVENT_PROPAGATE;
 
-    X49GPNG_PRESS_KEY( x49gp, key );
+    X50NG_PRESS_KEY( x49gp, key );
 
     return GDK_EVENT_STOP;
 }