Fixed all incorrect namespaces and paths