Fixing $this variable names.