Release/ws: Moving all definitions to WS naming.
Merge pull request #6 from websudos/release/ws_move

Release/ws: Moving all definitions to WS naming.
Merging develop branch