WPS layer renaming process complete - WPS refactor

...mpleted and tested