diff --git a/Images/asc-v1.prototype b/Images/aerofc-v1.prototype
similarity index 67%
rename from Images/asc-v1.prototype
rename to Images/aerofc-v1.prototype
index 29b7c93655..7fcfd232bb 100644
--- a/Images/asc-v1.prototype
+++ b/Images/aerofc-v1.prototype
@@ -1,10 +1,10 @@
 {
     "board_id": 65,
     "magic": "PX4FWv1",
-    "description": "Firmware for the ASCv1 board",
+    "description": "Firmware for the Intel Aero FC board",
     "image": "",
     "build_time": 0,
-    "summary": "ASCv1",
+    "summary": "AEROFCv1",
     "version": "0.1",
     "image_size": 0,
     "git_identity": "",
diff --git a/Makefile b/Makefile
index a9d82dae4c..1857dbff2f 100644
--- a/Makefile
+++ b/Makefile
@@ -224,7 +224,7 @@ check: 	check_px4fmu-v1_default \
 	check_mindpx-v2_default \
 	check_posix_sitl_default \
 	check_tap-v1_default \
-	check_asc-v1_default \
+	check_aerofc-v1_default \
 	check_px4-stm32f4discovery_default \
 	check_crazyflie_default \
 	check_tests \
diff --git a/cmake/configs/nuttx_asc-v1_default.cmake b/cmake/configs/nuttx_aerofc-v1_default.cmake
similarity index 98%
rename from cmake/configs/nuttx_asc-v1_default.cmake
rename to cmake/configs/nuttx_aerofc-v1_default.cmake
index 8e938b41e4..5c26736a66 100644
--- a/cmake/configs/nuttx_asc-v1_default.cmake
+++ b/cmake/configs/nuttx_aerofc-v1_default.cmake
@@ -11,7 +11,7 @@ set(config_module_list
 	drivers/stm32/adc
 	drivers/led
 	#drivers/px4fmu
-	drivers/boards/asc-v1
+	drivers/boards/aerofc-v1
 	drivers/rgbled_pwm
 	drivers/tap_esc
 	drivers/mpu6500
diff --git a/nuttx-configs/asc-v1/include/board.h b/nuttx-configs/aerofc-v1/include/board.h
similarity index 100%
rename from nuttx-configs/asc-v1/include/board.h
rename to nuttx-configs/aerofc-v1/include/board.h
diff --git a/nuttx-configs/asc-v1/include/nsh_romfsimg.h b/nuttx-configs/aerofc-v1/include/nsh_romfsimg.h
similarity index 100%
rename from nuttx-configs/asc-v1/include/nsh_romfsimg.h
rename to nuttx-configs/aerofc-v1/include/nsh_romfsimg.h
diff --git a/nuttx-configs/asc-v1/nsh/Make.defs b/nuttx-configs/aerofc-v1/nsh/Make.defs
similarity index 100%
rename from nuttx-configs/asc-v1/nsh/Make.defs
rename to nuttx-configs/aerofc-v1/nsh/Make.defs
diff --git a/nuttx-configs/asc-v1/nsh/defconfig b/nuttx-configs/aerofc-v1/nsh/defconfig
similarity index 100%
rename from nuttx-configs/asc-v1/nsh/defconfig
rename to nuttx-configs/aerofc-v1/nsh/defconfig
diff --git a/nuttx-configs/asc-v1/nsh/setenv.sh b/nuttx-configs/aerofc-v1/nsh/setenv.sh
similarity index 100%
rename from nuttx-configs/asc-v1/nsh/setenv.sh
rename to nuttx-configs/aerofc-v1/nsh/setenv.sh
diff --git a/nuttx-configs/asc-v1/scripts/ld.script b/nuttx-configs/aerofc-v1/scripts/ld.script
similarity index 100%
rename from nuttx-configs/asc-v1/scripts/ld.script
rename to nuttx-configs/aerofc-v1/scripts/ld.script
diff --git a/nuttx-configs/asc-v1/src/Makefile b/nuttx-configs/aerofc-v1/src/Makefile
similarity index 100%
rename from nuttx-configs/asc-v1/src/Makefile
rename to nuttx-configs/aerofc-v1/src/Makefile
diff --git a/nuttx-configs/asc-v1/src/empty.c b/nuttx-configs/aerofc-v1/src/empty.c
similarity index 100%
rename from nuttx-configs/asc-v1/src/empty.c
rename to nuttx-configs/aerofc-v1/src/empty.c
diff --git a/src/drivers/boards/asc-v1/CMakeLists.txt b/src/drivers/boards/aerofc-v1/CMakeLists.txt
similarity index 94%
rename from src/drivers/boards/asc-v1/CMakeLists.txt
rename to src/drivers/boards/aerofc-v1/CMakeLists.txt
index 538af2fb2f..8f0842ce84 100644
--- a/src/drivers/boards/asc-v1/CMakeLists.txt
+++ b/src/drivers/boards/aerofc-v1/CMakeLists.txt
@@ -32,15 +32,15 @@
 #
 ############################################################################
 px4_add_module(
-	MODULE drivers__boards__asc-v1
+	MODULE drivers__boards__aerofc-v1
 	COMPILE_FLAGS
 	SRCS
 		../common/board_name.c
-		asc_init.c
-		asc_timer_config.c
-		asc_spi.c
-		asc_usb.c
-		asc_led.c
+		aerofc_init.c
+		aerofc_timer_config.c
+		aerofc_spi.c
+		aerofc_usb.c
+		aerofc_led.c
 	DEPENDS
 		platforms__common
 	)
diff --git a/src/drivers/boards/asc-v1/asc_init.c b/src/drivers/boards/aerofc-v1/aerofc_init.c
similarity index 100%
rename from src/drivers/boards/asc-v1/asc_init.c
rename to src/drivers/boards/aerofc-v1/aerofc_init.c
diff --git a/src/drivers/boards/asc-v1/asc_led.c b/src/drivers/boards/aerofc-v1/aerofc_led.c
similarity index 100%
rename from src/drivers/boards/asc-v1/asc_led.c
rename to src/drivers/boards/aerofc-v1/aerofc_led.c
diff --git a/src/drivers/boards/asc-v1/asc_pwr.c b/src/drivers/boards/aerofc-v1/aerofc_pwr.c
similarity index 100%
rename from src/drivers/boards/asc-v1/asc_pwr.c
rename to src/drivers/boards/aerofc-v1/aerofc_pwr.c
diff --git a/src/drivers/boards/asc-v1/asc_spi.c b/src/drivers/boards/aerofc-v1/aerofc_spi.c
similarity index 98%
rename from src/drivers/boards/asc-v1/asc_spi.c
rename to src/drivers/boards/aerofc-v1/aerofc_spi.c
index 6b5dd47542..6840805dce 100644
--- a/src/drivers/boards/asc-v1/asc_spi.c
+++ b/src/drivers/boards/aerofc-v1/aerofc_spi.c
@@ -64,7 +64,7 @@
  * Name: stm32_spiinitialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the tap-v1 board.
+ *   Called to configure SPI chip select GPIO pins for the AEROFC-v1 board.
  *
  ************************************************************************************/
 
@@ -197,4 +197,4 @@ __EXPORT void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
 __EXPORT uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
 	return SPI_STATUS_PRESENT;
-}
\ No newline at end of file
+}
diff --git a/src/drivers/boards/asc-v1/asc_usb.c b/src/drivers/boards/aerofc-v1/aerofc_usb.c
similarity index 100%
rename from src/drivers/boards/asc-v1/asc_usb.c
rename to src/drivers/boards/aerofc-v1/aerofc_usb.c
diff --git a/src/drivers/boards/asc-v1/board_config.h b/src/drivers/boards/aerofc-v1/board_config.h
similarity index 99%
rename from src/drivers/boards/asc-v1/board_config.h
rename to src/drivers/boards/aerofc-v1/board_config.h
index d2e3f67419..d6e2a64a59 100644
--- a/src/drivers/boards/asc-v1/board_config.h
+++ b/src/drivers/boards/aerofc-v1/board_config.h
@@ -37,7 +37,7 @@
  * @author David Sidrane <david_s5@nscdg.com>
  * @author Lorenz Meier <lorenz@px4.io>
  *
- * TAP_V1 internal definitions
+ * AEROFC_V1 internal definitions
  */
 
 #pragma once
@@ -201,7 +201,7 @@
 #define HRT_TIMER		3	/* use timer8 for the HRT */
 #define HRT_TIMER_CHANNEL	4	/* use capture/compare channel */
 
-#define	BOARD_NAME "TAP_V1"
+#define	BOARD_NAME "AEROFC_V1"
 
 /* By Providing BOARD_ADC_USB_CONNECTED this board support the ADC
  * system_power interface, and herefore provides the true logic
diff --git a/src/drivers/drv_gpio.h b/src/drivers/drv_gpio.h
index 4ca2ca5d94..114c2a2d3a 100644
--- a/src/drivers/drv_gpio.h
+++ b/src/drivers/drv_gpio.h
@@ -219,7 +219,7 @@
 /* no GPIO driver on the PX4_STM32F4DISCOVERY board */
 #endif
 
-#ifdef CONFIG_ARCH_BOARD_ASC_V1
+#ifdef CONFIG_ARCH_BOARD_AEROFC_V1
 /* no GPIO driver on the ASC board */
 #endif
 
@@ -239,6 +239,7 @@
 	!defined(CONFIG_ARCH_BOARD_SITL) && \
 	!defined(CONFIG_ARCH_BOARD_TAP_V1) && \
 	!defined(CONFIG_ARCH_BOARD_ASC_V1) && \
+	!defined(CONFIG_ARCH_BOARD_AEROFC_V1) && \
 	!defined(CONFIG_ARCH_BOARD_CRAZYFLIE)
 # error No CONFIG_ARCH_BOARD_xxxx set
 #endif