Updated format, imports & the naming conventions used in tooltips