fixed tuple naming