reverted back to names instead of ids