Current naming is wrong according to SO: https://stackoverflow.com/a/42477769/9426128 Let's have correct naming now, that we can without breaking anyone's code Related to #35