Renamed package and plugin name.
Avoid code duplication.