diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 4d679e89c92..53c6043a014 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -226,9 +226,8 @@ device		vt_vbefb
 
 device		agp			# support several AGP chipsets
 
-# PCCARD (PCMCIA) support
-# PCMCIA and cardbus bridge support
-device		cbb			# cardbus (yenta) bridge
+# CardBus bridge support
+device		cbb			# CardBus (yenta) bridge
 device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index bdc4896ecdf..65e088cfe7c 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2162,10 +2162,10 @@ options		SND_PCM_64
 options		SND_OLDSTEREO
 
 #
-# PC Card/PCMCIA and Cardbus
+# Cardbus
 #
-# cbb: pci/cardbus bridge implementing YENTA interface
-# cardbus: cardbus slots
+# cbb: pci/CardBus bridge implementing YENTA interface
+# cardbus: CardBus slots
 device		cbb
 device		cardbus
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 679fc8b706f..23571385101 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -194,9 +194,8 @@ device		vt_vbefb
 
 device		agp			# support several AGP chipsets
 
-# PCCARD (PCMCIA) support
-# PCMCIA and cardbus bridge support
-device		cbb			# cardbus (yenta) bridge
+# CardBus bridge support
+device		cbb			# CardBus (yenta) bridge
 device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports