[all] fix names