changed to generic names in sample repository impl