Basic rename support

Added basic rename support.

Might not be how you guys want this stuff to work. If not, well, it's a start.