real RepositoryManager and some renaming