Renamed, cleaned up deps