Made namespacing section more consistent