Update and rename knight to Knight