Minor cosmetic cleanup of model references following the models module restructuring.