Clean up variable names

[AlexisRalli]

To make code work some shortcuts and copying of variables names were used. Sometimes incorrect names utilized (like 'dft' when 'rhf' used). Needs to be corrected... But doesn't effect functionality

[MIWdlB]

@AlexisRalli can we close this?

[AlexisRalli]

updated in other branches