Changing name to appropriate convention, updating test script