some house-keeping.
and final rename.