Renamed namespace to follow proper vendor naming and also bundle naming conventions.