some small changes toward new name