Removed old "WSFramework" style names and packages.