Some function name cleanup/changes to match the plugin name