updated script and naming conventions