relocations and renames per comments