Further improvements.
Renaming and related IB chnages.