Minor fixes to dependencies and naming.