fix names in new decorator