Other half of renamings and stuff. Untested!