[TASK] Structure Change to make naming consistent.