Button naming consistency