[TASK] Ensure non prefixed extension name
[TASK] Correct order of array elements