Work on model and dndFiles name cleanup