Quality of life fixes.

Signed-off-by: Atheriel <atheriel@gmail.com>
Revamp using a separate pluginName value. Other minor improvements.

Signed-off-by: Atheriel <atheriel@gmail.com>