Fix issues with renaming of diary entry controller