Some renaming based on changes in KenyaEMR
Improved test page