@wip commit of renaming

have some idea what can go wrong from this