Removed MKT waffle tables and renamed waffle tables

We did this on marketplace and thought it could also be done on AMO.