make usages of note consistent