Rename logger, trying to keep the structure consistent