#206 renamed everything, as much as I could find

let's merge