[TASK] Cleanup and naming adjustments