huge: name changes and link repairs: half done