Database Publishing Wizard doesn't capture DB name

I used the sql database publishing wizard 1.0 against a SQL2K5 SP2 server. It seems to properly captured all of my data and schema, but not the actual database name. When I restored the database the wizard created to another test sql server, it restored everything to [Databases \ System Database \ Master] instead of [Databases \ MyDBName ].

My original database was created under the umm, dbo credential.

Ideas on how to get the wizard to properly create the original database name (yes, I can manually put the sql commands into the script it generated, but then its not a fully functional wizard)?Found more bugs.

In my original database, I had a login that was under [Servername \ Security \ Logins] and an associated User under [Servername \ Databases \ MyDBName \ Security \ Users ]. The wizard created them in the new database as roles. This means the login accounts ended up in [Servername \ Databases \ System Databases \ Master \ Security \ Roles \ Database Roles\].