MAR-1 - rename classes to better reflect interface name
MAR-1 - Corrected red code position aggregator and configuration
Merge remote-tracking branch 'origin/develop' into develop