More naming NES things