8 files changed, 8 insertions, 17 deletions
diff --git a/src/mainboard/island/aruma/Config.lb b/src/mainboard/island/aruma/Config.lb
index b05eb49045..c9f0d86f3f 100644
--- a/src/mainboard/island/aruma/Config.lb
+++ b/src/mainboard/island/aruma/Config.lb
@@ -129,7 +129,7 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
 dir /pc80
 config chip.h
 
-# config for arima/hdama
+# config for agami/aruma
 chip northbridge/amd/amdk8/root_complex
         device apic_cluster 0 on
                 chip cpu/amd/socket_940
diff --git a/src/mainboard/island/aruma/Options.lb b/src/mainboard/island/aruma/Options.lb
index 87ff134cf1..c44fcd8ea4 100644
--- a/src/mainboard/island/aruma/Options.lb
+++ b/src/mainboard/island/aruma/Options.lb
@@ -121,7 +121,7 @@ default CONFIG_IOAPIC=1
 ## Clean up the motherboard id strings
 ##
 default MAINBOARD_PART_NUMBER="ARUMA"
-default MAINBOARD_VENDOR="ISLAND"
+default MAINBOARD_VENDOR="AGAMI"
 default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1022
 default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x36c0
 
diff --git a/src/mainboard/island/aruma/README.txt b/src/mainboard/island/aruma/README.txt
deleted file mode 100644
index a0d0c04724..0000000000
--- a/src/mainboard/island/aruma/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Patches for Island Aruma
-------------------------
-
-* hyperclocking.diff
-  this patch allows experimenting with hypertransport speeds
-  of the CPU<-->CPU and AMD8131 links. Do not overclock HT links
-  for production use!
-
-
diff --git a/src/mainboard/island/aruma/acpi_tables.c b/src/mainboard/island/aruma/acpi_tables.c
index eb19ae6880..3d98d505a4 100644
--- a/src/mainboard/island/aruma/acpi_tables.c
+++ b/src/mainboard/island/aruma/acpi_tables.c
@@ -1,5 +1,5 @@
 /*
- * Island Aruma ACPI support
+ * Agami Aruma ACPI support
  * written by Stefan Reinauer <stepan@openbios.org>
  *  (C) 2005 Stefan Reinauer
  */
diff --git a/src/mainboard/island/aruma/chip.h b/src/mainboard/island/aruma/chip.h
index 16e911672d..ec3254c28b 100644
--- a/src/mainboard/island/aruma/chip.h
+++ b/src/mainboard/island/aruma/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_island_aruma_ops;
+extern struct chip_operations mainboard_agami_aruma_ops;
 
-struct mainboard_island_aruma_config {
+struct mainboard_agami_aruma_config {
 	int nothing;
 };
diff --git a/src/mainboard/island/aruma/mainboard.c b/src/mainboard/island/aruma/mainboard.c
index 6de2b302b9..8670939330 100644
--- a/src/mainboard/island/aruma/mainboard.c
+++ b/src/mainboard/island/aruma/mainboard.c
@@ -333,7 +333,7 @@ static void enable_dev(struct device *dev)
 {
 	dev->ops = &mainboard_operations;
 }
-struct chip_operations mainboard_island_aruma_ops = {
+struct chip_operations mainboard_agami_aruma_ops = {
 	.enable_dev = enable_dev, 
 };
 
diff --git a/src/mainboard/island/aruma/mptable.c b/src/mainboard/island/aruma/mptable.c
index ce256e37f8..b598a79524 100644
--- a/src/mainboard/island/aruma/mptable.c
+++ b/src/mainboard/island/aruma/mptable.c
@@ -31,7 +31,7 @@ unsigned get_apicid_base(unsigned ioapic_num)
 void *smp_write_config_table(void *v)
 {
         static const char sig[4] = "PCMP";
-        static const char oem[8] = "ISLAND  ";
+        static const char oem[8] = "AGAMI   ";
         static const char productid[12] = "ARUMA       ";
         struct mp_config_table *mc;
 	int i;
diff --git a/src/mainboard/island/aruma/resourcemap.c b/src/mainboard/island/aruma/resourcemap.c
index 2a45082afb..7d193ca01e 100644
--- a/src/mainboard/island/aruma/resourcemap.c
+++ b/src/mainboard/island/aruma/resourcemap.c
@@ -1,5 +1,5 @@
 /*
- * Island Aruma needs a different resource map
+ * Agami Aruma needs a different resource map
  *
  */