ISIS-2569: some internal renaming towards 'bookmark'
9 files changed