Toby - Fixing up remaining references to bitemoi.