re-factored name changes