Changed script naming conventions