Add hack to work around the keyboard issue. Revert to old naming scheme.
More fixes and improvements.