Rename per @adam3smith's request (#531)