Fix up some names to be more descriptive