renamed extension in depenceny injection
Merge branch 'master' into develop