WP-3571 Changes for using the item id in the file name