Rename edits, fixes #1