added report naming and removed the id generation classes