WIP: proposed name changes

let's destroy it !!!