Refactored: shortened long variable names
Merge remote-tracking branch 'origin/development-habres' into development-habres