yes. I tried to cover current state. I plan to remove e.g. ```device_type``` in (hopefully) near future completely as it makes no sense when using new naming scheme.