Added lib3d, changed some names