updated paths + naming simplified naming