Renamed some fields and classes, fixed and re-added Waila