Renamed for clarity
Updated dependencies and streamlined naming