lots of small tweaks to naming.