Reverting usage of "this" in files