Convert system module to namespaced forms

Convert system module to use namespaced forms, plus a few other related fixes.