refactor preprocessor & bookmarks rename