Fix script

More changes required for new naming