Change names to (hopefully) more descriptive names.