Corrections due to changes in constant, class and file names.
Change in script name.