Change name to a better one