repository: variable naming consistency