small naming changes
Merge remote-tracking branch 'origin/develop-MW' into develop-JK