Renaming some things and work towards getting the keyboard to fit on the screen properly.