Fixed two issues and refactored extension name (#788)