* Renamed the bundle and extension class