Adjust class name and configuration

Change-Id: Ie03bf54e8e24a1c8a206a2aae3a2612755d307da