Small code improvements.
File names for tasks and menus changed to reflect the changes from node 2302893.