Renamed Take- and MakeOrder model and views
Refactored renames