File names fixed according to f202ad9f98fc6054f8b74a35a05adf9fed822bdd
`type` unescaped in *.kt files
Buildserver auto merge