Correct log messages to account for refactoring