CFY-1761 added device name to file system type