Bleh; Update renaming to occur only when name_was is not blank