Splitted NameByDateTaken to NameByDateAndId and NameByTimestamp