Fixed some variable name spaces