FIX: Fix of last merge with master
COSMIT: Renamings for easier understanding