better naming (continued)