change naming strategy as discussed on irc
Merge pull request #277 from pyr/feature-plugins

change naming strategy as discussed on irc