[DF-3978] data structures renamed to avoid possible name conflicts
[DF-3978] various fixes for review comments