replaced the class name to the alias by typedef for improving define-change tolerance.