Change Plugin name and resolve a couple of violations.