refactored protocol parser and allow human readable datasource name to be modified