Fixes Plug-ins naming inconsistency to conform with naming convention