Use BAT not Whimsy
diff --git a/pages/guides/graduation.ad b/pages/guides/graduation.ad
index 2bcf245..0ffd676 100644
--- a/pages/guides/graduation.ad
+++ b/pages/guides/graduation.ad
@@ -346,7 +346,7 @@
 calendar for meetings is link:http://www.apache.org/foundation/board/calendar.html[available].
 
 Business for the link:/guides/roles_and_responsibilities.html#the_board[Board] should be submitted
-using the link:https://whimsy.apache.org/board/agenda/[Whimsy Board Agenda] tool.
+using the link:https://agenda.apache.org/[Board Agenda Tool].
 
 Use the 'add item' button on bottom of the page and choose 'Establish Project'.
 The template requires the project name (without the 'Apache' prefix) plus a brief description of the
diff --git a/pages/guides/transferring.ad b/pages/guides/transferring.ad
index 1a809bb..20a832b 100644
--- a/pages/guides/transferring.ad
+++ b/pages/guides/transferring.ad
@@ -49,7 +49,7 @@
 link:graduation.html#preparing_a_charter[resolution]
 to be passed by the link:http://www.apache.org/foundation/board/[Board].
 You may look at older minutes from the link:http://www.apache.org/foundation/board/calendar.html[calendar] and check for "Establish ProjectName".
-link:https://whimsy.apache.org/board/agenda/[Board Agenda Tool] has an "Add Item" button that can be used to add the Graduation Resolution to the Board Agenda.
+link:https://agenda.apache.org/[Board Agenda Tool] has an "Add Item" button that can be used to add the Graduation Resolution to the Board Agenda.
 
 The Board votes on graduation resolutions at their monthly meeting.  If the Board votes to pass the resolution, that then appoints
 the listed Project Management Committee including: