Remove BUG same class name

Change-Id: Ic563f941ecf15b7a86111cd04472a53ac672c7c3