Merge pull request #2525 from janosh/subtrate->substrate

Add subtrate->substrate