Rename from code review feedback.