change names so they fit in the interface