More renaming and code documentation
plus a trivial compiler warning fix.
User-space tests successful.