somewhat better naming convention