some renames
rework for new logging system