refactor away the split between current and historic logs and clean up connection naming