naming fix
location fix