Refactoring on IdInfo and system derived names