naming cleanup to match other plugins
um