updates naming conventions for clarity