some more renames. basically everything is still workin, I think..
last wave of renames (hopefully)