various, mostly renaming
various cont.