Basic renaming stuff. Still broken tho.