ASM Directory or Alias Rename

I am on Oracle 10.2.0.4. I am migrating databases and consolidating
servers. Unfortunately I have Databases that have the same name. The
issue is that I now need to do a database rename.

I am thinking and have tried several approaches but wanted to get the
feedback of the group for the best way to do what I am trying to do.

ISSUE:
I have a database with the name testdb. In ASM I have everything under
+DATA/testdb.

I rename the Database with db new id 'nid target=/ DB_NAME=testdb1
SETNAME=yes' -- This is because I just need a new DB name and not a
new DBID. This is so the names don't clash under ASM.

Upon opening the DB, I now had a '+DATA/testdb' and '+DATA/testdb1'.
All the files are created under the new location but the old ones are
kept under the old. I went ahead and shut the DB down and removed all
files under the new location (mainly just archivelogs). I then tried
to rename the alias and directory. Both error out.