Cleanup/reorganization of the device id and their equivalent names.
Add new cards and cleanup naming of cards in filter.inf