rename some files, classes, variables in mask context

Joachim Wuttkerequested to merge
j.mask106 into main

Merge request reports