Fixed in components with accurate name giving