Finishes renaming plugin, improves behaviour in some edge cases.