Removal of innerHTML and some naming changes

Removal of innerHTML and some naming changes