Fixed bug #567: Fix up database name in Name-Plus-Record.