CONTENTBOX-415
Missing for contentstore and some renaming tweaks