refactored name to IDs