more changes to name and res