Fixed class names in the format of aaa.bbb.ccc