more renaming, stitchy actually works now