Resolving of concepts and renaming
Refactoring ID scheme