Support renaming dictionary elements

Change-Id: I4b446f27a83e381cb6872d607fdfa15085604f2f