Rename for OSGi compatibility...