Rename plugin and switch to static class