change return value keys