Name change and liverload fix