Implemented review comments to use extension name