NameMap refactoring, ORT fill method removed
beautify