Let's remove internal naming all through the plugin, so that it will be more geared toward public use.