Rename avalone to avalon (I had forgotten to fix these...)