diff --git a/Makefile b/Makefile
index f4136d5815..a42c02cd3d 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ IMAGEPATH=$(BUILD_TOPDIR)/bin
 UBOOT_BINARY=u-boot.bin
 BOARD_TYPE:=
 
-skylab_config:
+ap2_config:
 	export COMPRESSED_UBOOT=0
 	export CARABOOT_RELEASE=v2.2-dev
 
@@ -51,11 +51,11 @@ carambola2: BOARD_TYPE:= carambola2
 carambola2: UBOOTFILE=$(BOARD_TYPE)_u-boot.bin
 carambola2: carambola2_config compile
 
-skylab: BOARD_TYPE:= skylab
-skylab: UBOOTFILE=$(BOARD_TYPE)_u-boot.bin
-skylab: skylab_config compile
+ap2: BOARD_TYPE:= ap2
+ap2: UBOOTFILE=$(BOARD_TYPE)_u-boot.bin
+ap2: ap2_config compile
 
-all: carambola2 skylab
+all: carambola2 ap2
 
 clean:
 	cd $(UBOOTDIR) && $(MAKECMD) distclean
diff --git a/u-boot/Makefile b/u-boot/Makefile
index c9ad10f216..91ed1873f2 100644
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -275,9 +275,9 @@ carambola2_config: unconfig hornet_common_config
 	@echo "#define CARABOOT_RELEASE \"$(CARABOOT_RELEASE)\"" >>include/config.h
 	@./mkconfig -a carambola2 mips mips carambola2 ar7240 ar7240
 
-skylab_config: unconfig hornet_common_config
+ap2_config: unconfig hornet_common_config
 	@echo "#define CARABOOT_RELEASE \"$(CARABOOT_RELEASE)\"" >>include/config.h
-	@./mkconfig -a skylab mips mips carambola2 ar7240 ar7240
+	@./mkconfig -a ap2 mips mips carambola2 ar7240 ar7240
 
 
 hornet_common_config        :