Miguel/plugin refactor

I don't really care one way or another: just want to keep the definitions consistent throughout the codebase.