Clean up some naming and change the new to a primary button.