Got rid of RDB_NAME macro.