change names to reflect info in app