Simpler, less misleading terminology

@jonsterling