r8986: rename for aodbc compliance