use macro logging and rename several types