converting names for API query
merge with master