Also dumping correct name to file