Added some name sanification
Added type property