Renaming extension and small fixes