[Changed] Clean up script object creation variable names