rename, plumbing and a bit of cosmetics