Updated default selectors & class names