Renaming; support for nesting.