Reduce # of appearances of the ext name
Add functional test case :)