completion type and file system event objects renamed to be more consistent