rename files & fix brokenstick.formula with S3 consistency