Version 1.4, fix #1: Follow the changes of class name