Fix compile errors
Update for more mozilla-esque naming from scripts