Can rename now. Repare several bugs.