Puntis dev

Made changes to return the name of the components!