Added 'ModuleNamespace' to the descriptors.
Renamed the form controls functions.