Rename comment to note for all internal usage