More Naming Fixes, articles cleanup