Revert the dbname -> dbName part of r90430. dbname actually dates back to r32578...