- TSPHP-690 Improve code coverage typechecker
- some renamings