renamed main objects and updated indicators and UX