PM|AD: update global namespace to toolkit (from skytoolkit)