Update resources and correct topic names