Variable naming none-preventing fixes after last commit.