diff --git a/Makefile.ctr b/Makefile.ctr
index 91feeb4406..c277d3df77 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -228,7 +228,7 @@ endif
 %.vsh:
 
 $(TARGET).smdh: $(APP_ICON)
-	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
@@ -236,7 +236,7 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
 else
 	rm -f $(TARGET).xml
 endif
-	-3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITPRO)/devkitARM/bin/3dsxtool $< $@ $(_3DSXFLAGS)
 
 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
index 60ab600a2e..930b5badc7 100644
--- a/Makefile.ctr.salamander
+++ b/Makefile.ctr.salamander
@@ -44,7 +44,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 endif
 
 ifeq ($(strip $(CTRULIB)),)
-	CTRULIB = $(DEVKITPRO)/ctrulib
+	CTRULIB = $(DEVKITPRO)/libctru
 endif
 
 APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
@@ -160,7 +160,7 @@ endif
 %.vsh:
 
 $(TARGET).smdh: $(APP_ICON)
-	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITPRO)/devkitARM/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
diff --git a/pkg/ctr/Makefile.cores b/pkg/ctr/Makefile.cores
index fbb51d464d..ebf5cf7a5c 100644
--- a/pkg/ctr/Makefile.cores
+++ b/pkg/ctr/Makefile.cores
@@ -210,13 +210,13 @@ else ifeq ($(LIBRETRO), dosbox)
 	APP_ICON            = pkg/ctr/assets/dosbox.png
 	APP_BANNER          = pkg/ctr/assets/dosbox_banner.png
 
-else ifeq ($(LIBRETRO), np2)
+else ifeq ($(LIBRETRO), nekop2)
    APP_TITLE           = Neko Project 2
    APP_AUTHOR          = various
    APP_PRODUCT_CODE    = RARCH-NP2
    APP_UNIQUE_ID       = 0xBAC1C
-   APP_ICON            = pkg/ctr/assets/np2.png
-   APP_BANNER          = pkg/ctr/assets/np2_banner.png
+   APP_ICON            = pkg/ctr/assets/nekop2.png
+   APP_BANNER          = pkg/ctr/assets/nekop2_banner.png
 
 else ifeq ($(LIBRETRO), np2kai)
    APP_TITLE           = Neko Project 2 Kai
diff --git a/pkg/ctr/assets/np2.png b/pkg/ctr/assets/nekop2.png
similarity index 100%
rename from pkg/ctr/assets/np2.png
rename to pkg/ctr/assets/nekop2.png
diff --git a/pkg/ctr/assets/np2_banner.png b/pkg/ctr/assets/nekop2_banner.png
similarity index 100%
rename from pkg/ctr/assets/np2_banner.png
rename to pkg/ctr/assets/nekop2_banner.png