use PLUGIN_NAME everywhere
Merge pull request #3 from vbedrosova/serverAndAgent

use PLUGIN_NAME everywhere