Fixed namespace and other naming issues