Rename for clearer script identification
Rename, refactor extension scripts