[IMP] Improved typo, method name and data-selectors