Rename enums and update tests.
Add further logic to DatastreamParser.