refactoring of names, cleanup core logs