update for fixing issue with generation name_lastpart