Renamed namespace and packages