refactored docu names
fixed merge conflicts