Updated in light of interface name changes.