renamed metadata model and scanner