fix some syntax error & rename the old method to new