Riaan: Changed to a shorter, nicer naming convention for agendas.