Change style naming for better component structure