Namespaces and variable names fixes