minor namespace changes in the model