integrated modified deps and updated namings