Remove underscore prefix naming to avoid confusion