Issue #131 - add names instead of status codes