diff --git a/darwin/GNUfiles.mk b/darwin/GNUfiles.mk
index ae39d70e..c420d02d 100644
--- a/darwin/GNUfiles.mk
+++ b/darwin/GNUfiles.mk
@@ -38,7 +38,7 @@ MFILES += \
 HFILES += \
 	darwin/uipriv_darwin.h
 
-# TODO split into a separate file or put in GNUmakefile.libui somehow?
+# LONGTERM split into a separate file or put in GNUmakefile.libui somehow?
 
 # flags for Cocoa
 LDFLAGS += \
diff --git a/darwin/GNUosspecific.mk b/darwin/GNUosspecific.mk
index 39acdaa4..cc13d1b1 100644
--- a/darwin/GNUosspecific.mk
+++ b/darwin/GNUosspecific.mk
@@ -9,5 +9,5 @@ USESSONAME = 1
 SOVERSION = $(SOVERSIONA)
 SONAMEEXT = .$(SOVERSION)$(LIBSUFFIX)
 # note the explicit need for @rpath
-# TODO -current_version, -compatibility_version
+# LONGTERM -current_version, -compatibility_version
 SONAMEFLAG = -Wl,-install_name,@rpath/
diff --git a/darwin/util.m b/darwin/util.m
index 7031e9f8..ab873906 100644
--- a/darwin/util.m
+++ b/darwin/util.m
@@ -1,7 +1,7 @@
 // 7 april 2015
 #import "uipriv_darwin.h"
 
-// TODO do we really want to do this? make it an option?
+// LONGTERM do we really want to do this? make it an option?
 void disableAutocorrect(NSTextView *tv)
 {
 	[tv setEnabledTextCheckingTypes:0];
diff --git a/unix/GNUfiles.mk b/unix/GNUfiles.mk
index 2650ffa2..f442a4e2 100644
--- a/unix/GNUfiles.mk
+++ b/unix/GNUfiles.mk
@@ -39,7 +39,7 @@ HFILES += \
 	unix/draw.h \
 	unix/uipriv_unix.h
 
-# TODO split into a separate file or put in GNUmakefile.libui somehow?
+# LONGTERM split into a separate file or put in GNUmakefile.libui somehow?
 
 # flags for GTK+
 CFLAGS += \
diff --git a/unix/GNUosspecific.mk b/unix/GNUosspecific.mk
index 7d8cb726..5f6fc938 100644
--- a/unix/GNUosspecific.mk
+++ b/unix/GNUosspecific.mk
@@ -5,7 +5,7 @@ LIBSUFFIX = .so
 OSHSUFFIX = .h
 TOOLCHAIN = gcc
 
-# TODO clean up all the NAMEs and SUFFIXs and NOSOSUFFIXs or whatever it was
+# LONGTERM clean up all the NAMEs and SUFFIXs and NOSOSUFFIXs or whatever it was
 USESSONAME = 1
 SOVERSION = $(SOVERSION0)
 SONAMEEXT = $(LIBSUFFIX).$(SOVERSION)
diff --git a/windows/GNUfiles.mk b/windows/GNUfiles.mk
index 25fa9451..886aea58 100644
--- a/windows/GNUfiles.mk
+++ b/windows/GNUfiles.mk
@@ -63,7 +63,7 @@ HFILES += \
 RCFILES += \
 	windows/resources.rc
 
-# TODO split into a separate file or put in GNUmakefile.libui somehow?
+# LONGTERM split into a separate file or put in GNUmakefile.libui somehow?
 
 # flags for the Windows API
 # TODO prune this list