diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c
index 0434ae8ed789..ac394bdef78b 100644
--- a/sys/dev/acpi_support/acpi_panasonic.c
+++ b/sys/dev/acpi_support/acpi_panasonic.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2003 OGAWA Takaya <t-ogawa@triaez.kaisei.org>
- * Copyright (c) 2004 Yoshihiro TAKAHASHI <nyan@FreeBSD.org>
+ * Copyright (c) 2004 TAKAHASHI Yoshihiro <nyan@FreeBSD.org>
  * All rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/pc98/cbus/fdc_cbus.c b/sys/pc98/cbus/fdc_cbus.c
index de60a43d84cd..098ee5daefe2 100644
--- a/sys/pc98/cbus/fdc_cbus.c
+++ b/sys/pc98/cbus/fdc_cbus.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2004 Yoshihiro TAKAHASHI
+ * Copyright (c) 2004 TAKAHASHI Yoshihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/pc98/cbus/olptreg.h b/sys/pc98/cbus/olptreg.h
index 8168110ca549..80bc704f006c 100644
--- a/sys/pc98/cbus/olptreg.h
+++ b/sys/pc98/cbus/olptreg.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005 Yoshihiro TAKAHASHI
+ * Copyright (c) 2005 TAKAHASHI Yoshihiro
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/pc98/cbus/sio_cbus.c b/sys/pc98/cbus/sio_cbus.c
index a5c99461e105..2df560cd90cd 100644
--- a/sys/pc98/cbus/sio_cbus.c
+++ b/sys/pc98/cbus/sio_cbus.c
@@ -1,5 +1,6 @@
 /*-
- * Copyright (c) 2001 Yoshihiro TAKAHASHI.  All rights reserved.
+ * Copyright (c) 2001 TAKAHASHI Yoshihiro
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions