Fix bug, rename