Change naming scheme to make more semantic sense and no custom html attr