Change names so they don't clash with standard plugin