Merge pull request #613 from valentinewallace/less-confusing-chan-reserve-names