Fixed version namespace
Fixed namespace and version location