Rename refactor.
Deleted because it's generated file.
Added reference contributor for variabels.
Various improvements.