Renamed remaining "origin" variables
(forgotten in last commit..)