rework filename for uniqueid with class