diff --git a/drivers/README.txt b/drivers/README.txt
index 7cf2938d5a..ec65ccbe8e 100644
--- a/drivers/README.txt
+++ b/drivers/README.txt
@@ -12,10 +12,6 @@ Contents:
 Files in this directory
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-can/
-  This is the CAN drivers and logic support.  See include/nuttx/can/can.h
-  for usage information.
-
 dev_null.c and dev_zero.c
   These files provide the standard /dev/null and /dev/zero devices.
   See include/nuttx/fs/fs.h for functions that should be called if you
@@ -55,6 +51,10 @@ bch/
   performed by loop.c.  See include/nuttx/fs/fs.h for registration
   information.
 
+can/
+  This is the CAN drivers and logic support.  See include/nuttx/can/can.h
+  for usage information.
+
 contactless/
   Contactless devices are related to wireless devices.  They are not
   communication devices with other similar peers, but couplers/interfaces
diff --git a/drivers/can/Make.defs b/drivers/can/Make.defs
index 25d9997165..9a1504664c 100644
--- a/drivers/can/Make.defs
+++ b/drivers/can/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # drivers/can/Make.defs
 #
-#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@ ifeq ($(CONFIG_CAN),y)
 
 CSRCS += can.c
 
-ifeq ($(CONFIG_MCP2515),y)
+ifeq ($(CONFIG_CAN_MCP2515),y)
 CSRCS += mcp2515.c
 endif
 
diff --git a/drivers/can/can.c b/drivers/can/can.c
index dd810ebcd1..730d7e84b5 100644
--- a/drivers/can/can.c
+++ b/drivers/can/can.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/can.c
+ * drivers/can/can.c
  *
  *   Copyright (C) 2008-2009, 2011-2012, 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +57,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/drivers/can.h>
+#include <nuttx/can/can.h>
 
 #ifdef CONFIG_CAN_TXREADY
 #  include <nuttx/wqueue.h>
diff --git a/include/nuttx/can/can.h b/include/nuttx/can/can.h
index 68df58dd79..e85a9fa54d 100644
--- a/include/nuttx/can/can.h
+++ b/include/nuttx/can/can.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * include/nuttx/drivers/can.h
+ * include/nuttx/can/can.h
  *
  *   Copyright (C) 2008, 2009, 2011-2012, 2015-2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_DRVERS_CAN_H
-#define __INCLUDE_NUTTX_DRVERS_CAN_H
+#ifndef __INCLUDE_NUTTX_CAN_CAN_H
+#define __INCLUDE_NUTTX_CAN_CAN_H
 
 /************************************************************************************
  * Included Files
@@ -819,4 +819,4 @@ int can_txready(FAR struct can_dev_s *dev);
 #endif
 
 #endif /* CONFIG_CAN */
-#endif /* __INCLUDE_NUTTX_DRVERS_CAN_H */
+#endif /* __INCLUDE_NUTTX_CAN_CAN_H */