Update naming for more clear comprehension and separation.