Fixed naming issue and libclang support