Five years later since the original commit, is probably not so bad timing on calling things by their clear name.