Move Rename suggestions to Logic