Dp 3122

We should also think about new tests for this changes. Before merging please contact with me.
why sometimes camelCase sometimes a_b notations, and then even a-b?