Rename since we will use it to make the full package easier.
Authored by: otavio 2005-10-31
Parent: [r2443]
Child: [r2445]