[TASK] Namechanges according to new name