Make hard-coding of names explicit