- repository base class update
- some name fixes