fixed the extension parser and changed some names