refactor to new device ident
also add missing macloaders