Finish renaming plugin and move to static class