Move to standard dependency naming convention.