Refactor and integration of list naming