Trim comment.
Better variable names.
Bug: 13196 Fix renaming subfolders in EAS clients.