Change name of rock to rook, and some other changes
recommit, solve the conflict