updated dependencies and naming to follow better conventions