Merged renaming and JD changes