Merge "Add proper namespace to GraphicTypes."