Switch to acorn usage