Renamed namespace for better fit