Removal of innerHTML and some naming changes