Fixed naming as it (ironically) went against the design notes.