kernel: fix all nanokernel usage in comments

Also include kernel.h instead of nanokernel.h

Change-Id: I65dc5e31b5409b809397296817e2d5e7adf28892
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

kernel/include/gen_offset.h

diff --git a/kernel/include/gen_offset.h b/kernel/include/gen_offset.h
index 9b8286d..de5ae4f 100644
--- a/kernel/include/gen_offset.h
+++ b/kernel/include/gen_offset.h
@@ -18,11 +18,11 @@
  * @file
  * @brief Macros to generate structure member offset definitions
  *
- * This header contains macros to allow a nanokernel implementation to
- * generate absolute symbols whose values represents the member offsets for
- * various nanokernel structures.  These absolute symbols are typically
- * utilized by assembly source files rather than hardcoding the values in
- * some local header file.
+ * This header contains macros to allow a kernel implementation to generate
+ * absolute symbols whose values represents the member offsets for various
+ * kernel structures.  These absolute symbols are typically utilized by
+ * assembly source files rather than hardcoding the values in some local header
+ * file.
  *
  * WARNING: Absolute symbols can potentially be utilized by external tools --
  * for example, to locate a specific field within a data structure.

kernel/include/nano_internal.h

diff --git a/kernel/include/nano_internal.h b/kernel/include/nano_internal.h
index 5396133..dfc4fbb 100644
--- a/kernel/include/nano_internal.h
+++ b/kernel/include/nano_internal.h
@@ -16,10 +16,9 @@
 
 /**
  * @file
- * @brief Architecture-independent private nanokernel APIs
+ * @brief Architecture-independent private kernel APIs
  *
- * This file contains private nanokernel APIs that are not
- * architecture-specific.
+ * This file contains private kernel APIs that are not architecture-specific.
  */
 
 #ifndef _NANO_INTERNAL__H_

kernel/include/wait_q.h

diff --git a/kernel/include/wait_q.h b/kernel/include/wait_q.h
index df65386..44b72a1 100644
--- a/kernel/include/wait_q.h
+++ b/kernel/include/wait_q.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#ifndef _kernel_nanokernel_include_wait_q__h_
-#define _kernel_nanokernel_include_wait_q__h_
+#ifndef _kernel_include_wait_q__h_
+#define _kernel_include_wait_q__h_
 
 #include <kernel_structs.h>
 #include <misc/dlist.h>
@@ -56,4 +56,4 @@
 }
 #endif
 
-#endif /* _kernel_nanokernel_include_wait_q__h_ */
+#endif /* _kernel_include_wait_q__h_ */