Refactor plugin names, test file names