Address Reynold's comments, including major rename