Renamed internal class and renamed some test cases.