Additional adjustments to upgrade module, etc.
Further cleanup and adjusted save procedures
Cleanup of class/method naming