updates the part of namers copy/pasted into paradise to be in sync with recent changes in trunk