rename old variables
Merge branch 'master' of https://github.com/algard/Nimbus
one more
Merge branch 'master' of https://github.com/algard/Nimbus