Working on getting renaming to deal with client modules too.