Better dependency handling
Revert lockFile read change; force naming behavior in status