Fix new asset names pumpstation and channel
Merge conflict
Merge pull request #223 from nens/arjen_fix_pumpstations

Fix new asset names pumpstation and channel