Merge "Rename should behave like create: avoid conflict."