initial pass at resolving rename bugz