Fixed bug caused by new naming rules