Be more mnemonic with names