Fixed plugin name; fixed inconsitency of service name.